X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=eclipse%2Fplugins%2Forg.argeo.slc.client.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fviews%2FJcrExecutionModulesView.java;h=025fb55c10c757a263ffcae2262779fc68f04ae7;hb=15fdf876a4dbb73b379f8c6c16d7d929955ade4d;hp=eaa4cdd885c5a02d95d091308c99b7b941cfb283;hpb=a181e3d059185a9dc108e81f38c66f48f4e4aac8;p=gpl%2Fargeo-slc.git

diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
index eaa4cdd88..025fb55c1 100644
--- a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
+++ b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Properties;
 
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
@@ -24,14 +23,11 @@ import org.argeo.eclipse.ui.jcr.SimpleNodeContentProvider;
 import org.argeo.eclipse.ui.jcr.WrappedNode;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.SlcImages;
-import org.argeo.slc.client.ui.controllers.ProcessController;
 import org.argeo.slc.client.ui.editors.ProcessEditor;
 import org.argeo.slc.client.ui.editors.ProcessEditorInput;
-import org.argeo.slc.client.ui.providers.ExecutionModulesContentProvider.FlowNode;
 import org.argeo.slc.jcr.SlcJcrConstants;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.jcr.SlcTypes;
-import org.argeo.slc.process.RealizedFlow;
 import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
@@ -46,6 +42,7 @@ import org.eclipse.swt.dnd.TextTransfer;
 import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.ViewPart;
 
@@ -60,8 +57,6 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 
 	private Session session;
 
-	private ProcessController processController;
-
 	public void createPartControl(Composite parent) {
 		viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
 		ColumnViewerToolTipSupport.enableFor(viewer);
@@ -234,41 +229,15 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 					if (node.isNodeType(SLC_EXECUTION_FLOW)) {
 						List<String> paths = new ArrayList<String>();
 						paths.add(node.getPath());
-						PlatformUI
-								.getWorkbench()
-								.getActiveWorkbenchWindow()
-								.getActivePage()
-								.openEditor(
-										new ProcessEditorInput(paths, true),
-										ProcessEditor.ID);
+						IWorkbenchPage activePage = PlatformUI.getWorkbench()
+								.getActiveWorkbenchWindow().getActivePage();
+						activePage.openEditor(new ProcessEditorInput(paths,
+								true), ProcessEditor.ID);
 					}
 				}
 			} catch (Exception e) {
 				throw new SlcException("Cannot open " + obj, e);
 			}
-
-			// if (obj instanceof ExecutionModulesContentProvider.FlowNode) {
-			// ExecutionModulesContentProvider.FlowNode fn =
-			// (ExecutionModulesContentProvider.FlowNode) obj;
-			//
-			// List<RealizedFlow> realizedFlows = new ArrayList<RealizedFlow>();
-			// RealizedFlow realizedFlow = new RealizedFlow();
-			// realizedFlow.setModuleName(fn.getExecutionModuleNode()
-			// .getDescriptor().getName());
-			// realizedFlow.setModuleVersion(fn.getExecutionModuleNode()
-			// .getDescriptor().getVersion());
-			// realizedFlow.setFlowDescriptor(fn.getExecutionModuleNode()
-			// .getFlowDescriptors().get(fn.getFlowName()));
-			// realizedFlows.add(realizedFlow);
-			//
-			// SlcExecution slcExecution = new SlcExecution();
-			// slcExecution.setUuid(UUID.randomUUID().toString());
-			// slcExecution.setRealizedFlows(realizedFlows);
-			// slcExecution.setHost(fn.getExecutionModuleNode().getAgentNode()
-			// .getAgent().toString());
-			// processController.execute(fn.getExecutionModuleNode()
-			// .getAgentNode().getAgent(), slcExecution);
-			// }
 		}
 
 	}
@@ -314,31 +283,6 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 						// TODO Auto-generated catch block
 						e1.printStackTrace();
 					}
-					//
-					// // ExecutionModulesContentProvider.FlowNode flowNode =
-					// (ExecutionModulesContentProvider.FlowNode) selection
-					// // .getFirstElement();
-					// //
-					// // Properties props = new Properties();
-					// // flowNodeAsProperties(props, flowNode);
-					// // props.setProperty("agentId", flowNode
-					// // .getExecutionModuleNode().getAgentNode().getAgent()
-					// // .getAgentUuid());
-					// // props.setProperty("host",
-					// flowNode.getExecutionModuleNode()
-					// // .getAgentNode().getAgent().toString());
-					// //
-					// // ByteArrayOutputStream out = new
-					// ByteArrayOutputStream();
-					// // try {
-					// // props.store(out, "");
-					// // event.data = new String(out.toByteArray());
-					// // } catch (IOException e) {
-					// // throw new SlcException(
-					// // "Cannot transform realized flow", e);
-					// // } finally {
-					// // IOUtils.closeQuietly(out);
-					// // }
 				}
 			}
 		}
@@ -348,32 +292,6 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 				log.debug("Finished Drag " + event);
 		}
 
-		protected void flowNodeAsProperties(Properties props, FlowNode fn) {
-
-			RealizedFlow realizedFlow = new RealizedFlow();
-			realizedFlow.setModuleName(fn.getExecutionModuleNode()
-					.getDescriptor().getName());
-			realizedFlow.setModuleVersion(fn.getExecutionModuleNode()
-					.getDescriptor().getVersion());
-			realizedFlow.setFlowDescriptor(fn.getExecutionFlowDescriptor());
-
-			// As we want to have the effective ExecutionSpec and not a
-			// reference; we store it at the RealizeFlow level : thus the
-			// marshaller will store the object and not only a reference.
-			realizedFlow.setExecutionSpec(fn.getExecutionFlowDescriptor()
-					.getExecutionSpec());
-
-			// props.setProperty("RealizedFlowAsXml",
-			// oxmBean.marshal(realizedFlow));
-			// System.out
-			// .println(oxmBean.marshal(fn.getExecutionFlowDescriptor()));
-
-		}
-
-	}
-
-	public void setProcessController(ProcessController processController) {
-		this.processController = processController;
 	}
 
 	public void setSession(Session session) {