Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZeb Ford-Reitz2011-05-30 04:08:10 -0400
committerZeb Ford-Reitz2011-05-30 04:08:10 -0400
commitb0084d4a477fb6b835df1368dc0f87d24c4aa8ea (patch)
tree55ec4f7583669c6b7f6fd8833705b9481369f670
parent206f9459b4cb662b8978cc17dd933b0072ff81f5 (diff)
parentec2b70c2065c032f9cf49be5e3b7f74ff86b0934 (diff)
downloadorg.eclipse.jubula.core-b0084d4a477fb6b835df1368dc0f87d24c4aa8ea.tar.gz
org.eclipse.jubula.core-b0084d4a477fb6b835df1368dc0f87d24c4aa8ea.tar.xz
org.eclipse.jubula.core-b0084d4a477fb6b835df1368dc0f87d24c4aa8ea.zip
Merge branch 'master' of
ssh://gatekeeper.bredex.de:2405/gitroot/jubula/org.eclipse.jubula.core Conflicts: org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/UINodeBP.java org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/labelprovider/decorators/TestDataDecorator.java Also fixes a checkstyle error. Certain lines were longer than 80 characters.
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/CompletenessBP.java9
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/UINodeBP.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/labelprovider/decorators/TestDataDecorator.java21
3 files changed, 17 insertions, 15 deletions
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/CompletenessBP.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/CompletenessBP.java
index c9b166db2..fdc1b5bdf 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/CompletenessBP.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/CompletenessBP.java
@@ -51,11 +51,12 @@ public class CompletenessBP implements
* private constructor
*/
private CompletenessBP() {
- DataEventDispatcher.getInstance().addDataChangedListener(this, false);
- DataEventDispatcher.getInstance().addLanguageChangedListener(this,
- false);
- DataEventDispatcher.getInstance().addProjectLoadedListener(this, false);
+ DataEventDispatcher ded = DataEventDispatcher.getInstance();
+ ded.addDataChangedListener(this, false);
+ ded.addLanguageChangedListener(this, false);
+ ded.addProjectLoadedListener(this, false);
}
+
/**
* @return the ComponentNamesList
*/
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/UINodeBP.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/UINodeBP.java
index a5a136c1b..38938d8b1 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/UINodeBP.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/UINodeBP.java
@@ -41,7 +41,7 @@ public class UINodeBP {
private UINodeBP() {
// do nothing
}
-
+
/**
* sets the selection in the given TreeViewer to the given node and also
* gives the given tree viewer focus
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/labelprovider/decorators/TestDataDecorator.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/labelprovider/decorators/TestDataDecorator.java
index 7addef0ff..73c0b85e9 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/labelprovider/decorators/TestDataDecorator.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/labelprovider/decorators/TestDataDecorator.java
@@ -48,7 +48,6 @@ public class TestDataDecorator extends AbstractLightweightLabelDecorator {
*/
public void decorate(Object element, IDecoration decoration) {
decoration.setForegroundColor(Layout.DEFAULT_OS_COLOR);
-
final INodePO node = (INodePO)element;
if (shouldNotDecorate(node, decoration)) {
return;
@@ -88,8 +87,10 @@ public class TestDataDecorator extends AbstractLightweightLabelDecorator {
boolean overWrittenName = false;
if (grandParent instanceof IExecTestCasePO) {
IExecTestCasePO execTC = (IExecTestCasePO)grandParent;
- for (ICompNamesPairPO pair : execTC.getCompNamesPairs()) {
- if (pair.getFirstName().equals(cap.getComponentName())
+ for (ICompNamesPairPO pair
+ : execTC.getCompNamesPairs()) {
+ if (pair.getFirstName().equals(
+ cap.getComponentName())
&& pair.getSecondName() != null
&& !pair.getSecondName().equals(
cap.getComponentName())) {
@@ -122,19 +123,19 @@ public class TestDataDecorator extends AbstractLightweightLabelDecorator {
}
/**
- * @param gnode
- * the gui node
+ * @param node
+ * the node
* @param decoration
* the decoration
* @return wheter decoration should continue for this element or not
*/
- private boolean shouldNotDecorate(INodePO gnode, IDecoration decoration) {
- return gnode == null
- || gnode.getParentNode() == null
- || NodeBP.getOwningTestSuite(gnode) == null
+ private boolean shouldNotDecorate(INodePO node, IDecoration decoration) {
+ return node == null
+ || node.getParentNode() == null
+ || NodeBP.getOwningTestSuite(node) == null
|| decoration.getDecorationContext()
instanceof JBEditorDecorationContext
- || gnode instanceof IProjectPO;
+ || node instanceof IProjectPO;
}
/**

Back to the top