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 325257ff79a651af1111019b8a056732bd2eb9b8..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
@@ -8,9 +8,10 @@ import java.util.Properties;
 import java.util.UUID;
 
 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;
@@ -37,8 +38,8 @@ import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.ViewPart;
 
 public class ExecutionModulesView extends ViewPart {
-       // private final static Log log = LogFactory
-       // .getLog(ExecutionModulesView.class);
+       private final static Log log = LogFactory
+                       .getLog(ExecutionModulesView.class);
 
        public static final String ID = "org.argeo.slc.client.ui.executionModulesView";
 
@@ -46,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) {
@@ -78,10 +79,11 @@ public class ExecutionModulesView extends ViewPart {
                        if (obj instanceof ExecutionModulesContentProvider.ExecutionModuleNode) {
                                ExecutionModuleDescriptor emd = ((ExecutionModulesContentProvider.ExecutionModuleNode) obj)
                                                .getDescriptor();
-                               if (emd.getLabel() != null)
+                               if (emd.getLabel() != null) {
                                        return emd.getLabel();
-                               else
+                               } else {
                                        return getText(emd);
+                               }
                        } else
                                return getText(obj);
                }
@@ -92,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);
@@ -145,8 +143,8 @@ public class ExecutionModulesView extends ViewPart {
                }
 
                public void dragSetData(DragSourceEvent event) {
-                       System.out.println("dragSetData: " + event);
-                       // System.out.println("dataType: " + event.dataType);
+
+                       // System.out.println("dragSetData: " + event);
 
                        IStructuredSelection selection = (IStructuredSelection) viewer
                                        .getSelection();
@@ -197,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()));
 
                }
 
@@ -215,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