SLC RAP working with UI admin

[gpl/argeo-slc.git] / eclipse / plugins / org.argeo.slc.client.ui / src / main / java / org / argeo / slc / client / ui / views / ExecutionModulesView.java

diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ExecutionModulesView.java b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ExecutionModulesView.java
index ee78b30aa50f3bad96cd7854946ca76319b52b6d..008b65545cb23bc1e5af707656cb9287c4bf0fd8 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ExecutionModulesView.java
+++ b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ExecutionModulesView.java
@@ -11,8 +11,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.client.oxm.OxmInterface;
-import org.argeo.slc.client.ui.ClientUiPlugin;
+import org.argeo.slc.client.ui.SlcImages;
 import org.argeo.slc.client.ui.controllers.ProcessController;
 import org.argeo.slc.client.ui.providers.ExecutionModulesContentProvider;
 import org.argeo.slc.client.ui.providers.ExecutionModulesContentProvider.FlowNode;
@@ -48,7 +47,7 @@ public class ExecutionModulesView extends ViewPart {
 
        // Ioc
        private IContentProvider contentProvider;
-       private OxmInterface oxmBean;
+       //private OxmInterface oxmBean;
        private ProcessController processController;
 
        public void createPartControl(Composite parent) {
@@ -80,14 +79,9 @@ public class ExecutionModulesView extends ViewPart {
                        if (obj instanceof ExecutionModulesContentProvider.ExecutionModuleNode) {
                                ExecutionModuleDescriptor emd = ((ExecutionModulesContentProvider.ExecutionModuleNode) obj)
                                                .getDescriptor();
-                               System.out
-                                               .println("obj instanceof ExecutionModulesContentProvider.ExecutionModuleNode");
-                               log.debug("obj instanceof ExecutionModulesContentProvider.ExecutionModuleNode");
                                if (emd.getLabel() != null) {
-                                       log.debug("and label is : " + emd.getLabel());
                                        return emd.getLabel();
                                } else {
-                                       log.debug("label is null and text is : " + getText(emd));
                                        return getText(emd);
                                }
                        } else
@@ -100,17 +94,13 @@ public class ExecutionModulesView extends ViewPart {
 
                public Image getImage(Object obj) {
                        if (obj instanceof ExecutionModulesContentProvider.AgentNode)
-                               return ClientUiPlugin.getDefault().getImageRegistry()
-                                               .get("agent");
+                               return SlcImages.AGENT;
                        else if (obj instanceof ExecutionModulesContentProvider.ExecutionModuleNode)
-                               return ClientUiPlugin.getDefault().getImageRegistry()
-                                               .get("executionModule");
+                               return SlcImages.MODULE;
                        else if (obj instanceof ExecutionModulesContentProvider.FolderNode)
-                               return ClientUiPlugin.getDefault().getImageRegistry()
-                                               .get("folder");
+                               return SlcImages.FOLDER;
                        else if (obj instanceof ExecutionModulesContentProvider.FlowNode)
-                               return ClientUiPlugin.getDefault().getImageRegistry()
-                                               .get("flow");
+                               return SlcImages.FLOW;
                        else
                                return PlatformUI.getWorkbench().getSharedImages()
                                                .getImage(ISharedImages.IMG_OBJ_ELEMENT);
@@ -205,10 +195,10 @@ public class ExecutionModulesView extends ViewPart {
                        realizedFlow.setExecutionSpec(fn.getExecutionFlowDescriptor()
                                        .getExecutionSpec());
 
-                       props.setProperty("RealizedFlowAsXml",
-                                       oxmBean.marshal(realizedFlow));
-                       System.out
-                                       .println(oxmBean.marshal(fn.getExecutionFlowDescriptor()));
+//                     props.setProperty("RealizedFlowAsXml",
+//                                     oxmBean.marshal(realizedFlow));
+//                     System.out
+//                                     .println(oxmBean.marshal(fn.getExecutionFlowDescriptor()));
 
                }
 
@@ -223,8 +213,8 @@ public class ExecutionModulesView extends ViewPart {
                this.processController = processController;
        }
 
-       public void setOxmBean(OxmInterface oxmBean) {
-               this.oxmBean = oxmBean;
-       }
+//     public void setOxmBean(OxmInterface oxmBean) {
+//             this.oxmBean = oxmBean;
+//     }
 
 }
\ No newline at end of file