Fix erros in SLC

git-svn-id: https://svn.argeo.org/slc/trunk@4242 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/ModulesView.java b/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/ModulesView.java
index 6745d91b8641f7ed504cfe39818b8e519b5f7b3e..f476d82a9928759d511221254e2b80569c56b3e1 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/ModulesView.java
+++ b/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/ModulesView.java
@@ -10,7 +10,6 @@ import java.util.TreeSet;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.eclipse.ui.TreeObject;
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.eclipse.jface.viewers.ITableLabelProvider;
@@ -299,7 +298,7 @@ public class ModulesView extends ViewPart {
                                addChild(usingBundles);
                                for (Bundle b : usedBundles) {
                                        if (b != null)
-                                               usingBundles.addChild(new TreeObject(b
+                                               usingBundles.addChild(new TreeParent(b
                                                                .getSymbolicName()));
                                }
                        }
@@ -307,7 +306,7 @@ public class ModulesView extends ViewPart {
                        TreeParent properties = new TreeParent("Properties");
                        addChild(properties);
                        for (String key : serviceReference.getPropertyKeys()) {
-                               properties.addChild(new TreeObject(key + "="
+                               properties.addChild(new TreeParent(key + "="
                                                + serviceReference.getProperty(key)));
                        }
 

diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/providers/ExecutionModulesContentProvider.java b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/providers/ExecutionModulesContentProvider.java
index 1278609bde2adfeddd15cf52b1877e0549230aac..059d8611a77a13a9766b63a936da25c79a64e55f 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/providers/ExecutionModulesContentProvider.java
+++ b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/providers/ExecutionModulesContentProvider.java
@@ -9,7 +9,6 @@ import java.util.TreeMap;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.eclipse.ui.TreeObject;
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.slc.execution.ExecutionFlowDescriptor;
 import org.argeo.slc.execution.ExecutionModuleDescriptor;
@@ -218,7 +217,7 @@ public class ExecutionModulesContentProvider implements ITreeContentProvider {
         *         we store the parent node (execution module node) & the
         *         ExecutionFlowDescriptor.
         */
-       public class FlowNode extends TreeObject {
+       public class FlowNode extends TreeParent {
 
                private final String flowName;
                private final ExecutionModuleNode executionModuleNode;

diff --git a/eclipse/runtime/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/contentprovider/ResultDetailContentProvider.java b/eclipse/runtime/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/contentprovider/ResultDetailContentProvider.java
index 36c96326647b246a9b91dca78377ce814e6562d4..3489c92f2a19544825533df3381ec2bc3225709d 100644 (file)
--- a/eclipse/runtime/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/contentprovider/ResultDetailContentProvider.java
+++ b/eclipse/runtime/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/contentprovider/ResultDetailContentProvider.java
@@ -5,7 +5,6 @@ import java.util.SortedMap;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.eclipse.ui.TreeObject;
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.slc.core.structure.tree.TreeSPath;
 import org.argeo.slc.core.test.tree.PartSubList;
@@ -41,8 +40,8 @@ public class ResultDetailContentProvider implements ITreeContentProvider {
        }
 
        public Object getParent(Object node) {
-               if (node instanceof TreeObject) {
-                       return ((TreeObject) node).getParent();
+               if (node instanceof TreeParent) {
+                       return ((TreeParent) node).getParent();
                }
                return null;
        }
@@ -119,10 +118,10 @@ public class ResultDetailContentProvider implements ITreeContentProvider {
                if (node instanceof ResultTreeParent) {
                        ResultTreeParent rtp = (ResultTreeParent) node;
                        // we dig the tree recursivly
-                       for (TreeObject to : rtp.getChildren())
+                       for (TreeParent to : rtp.getChildren())
                                setIsPassed((StatusAware) to);
                        // we set is passed
-                       for (TreeObject to : rtp.getChildren()) {
+                       for (TreeParent to : rtp.getChildren()) {
                                if (!((StatusAware) to).isPassed()) {
                                        rtp.isPassed = false;
                                        return;
@@ -158,7 +157,7 @@ public class ResultDetailContentProvider implements ITreeContentProvider {
                }
        }
 
-       public class ResultTreeObject extends TreeObject implements StatusAware {
+       public class ResultTreeObject extends TreeParent implements StatusAware {
 
                public ResultTreeObject(String name) {
                        super(name);