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%2FProcessBuilderView.java;h=c293cb38b40d5d7c41529df5a58fc3c6888047c9;hb=7a047ccee1387ff0c6fdd05948e152bdf7babdf9;hp=37000e2a125f89fe376bbecac7ce68b6a00af605;hpb=a857d591b8658b2f94ec9398b94e9447f130eb9d;p=gpl%2Fargeo-slc.git

diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessBuilderView.java b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessBuilderView.java
index 37000e2a1..c293cb38b 100644
--- a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessBuilderView.java
+++ b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessBuilderView.java
@@ -9,7 +9,6 @@ import java.util.UUID;
 
 import org.apache.commons.io.IOUtils;
 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.controllers.ProcessController;
 import org.argeo.slc.process.RealizedFlow;
@@ -30,7 +29,6 @@ import org.eclipse.swt.dnd.TextTransfer;
 import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.dnd.TransferData;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
@@ -39,9 +37,9 @@ import org.eclipse.ui.part.ViewPart;
 
 /**
  * Display a list of processes that are to be launched as batch. For the moment
- * being, only one agent by batch is enabled. The batch is contructed by
+ * being, only one agent by batch is enabled. The batch is constructed by
  * dropping process from the ExecutionModuleView. Wrong type of data dropped in
- * this view might raise errors.
+ * this view raises an error.
  * 
  * @author bsinou
  * 
@@ -52,9 +50,6 @@ public class ProcessBuilderView extends ViewPart {
 
 	public static final String ID = "org.argeo.slc.client.ui.processBuilderView";
 
-	// private final static Log log =
-	// LogFactory.getLog(ProcessBuilderView.class);
-
 	private TableViewer viewer;
 	private List<RealizedFlow> realizedFlows = new ArrayList<RealizedFlow>();
 	private String currentAgentUuid = null;
@@ -65,7 +60,7 @@ public class ProcessBuilderView extends ViewPart {
 	private int curSelectedRow = -1;
 
 	// IoC
-	private OxmInterface oxmBean;
+	//private OxmInterface oxmBean;
 	private ProcessController processController;
 	private List<SlcAgent> slcAgents;
 
@@ -85,16 +80,10 @@ public class ProcessBuilderView extends ViewPart {
 
 	protected Table createTable(Composite parent) {
 		int style = SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL
-				| SWT.FULL_SELECTION | SWT.HIDE_SELECTION;
+				| SWT.FULL_SELECTION;
 
 		Table table = new Table(parent, style);
 
-//		GridData gridData = new GridData(GridData.FILL_BOTH);
-//		gridData.grabExcessVerticalSpace = true;
-//		gridData.grabExcessHorizontalSpace = true;
-//		gridData.horizontalSpan = 3;
-//		table.setLayoutData(gridData);
-
 		table.setLinesVisible(true);
 		table.setHeaderVisible(true);
 
@@ -171,7 +160,7 @@ public class ProcessBuilderView extends ViewPart {
 		}
 	}
 
-	// Return the list of the processes to execute.
+	// Launches the execution of listed realized flow with specified parameters.
 	public void launchBatch() {
 		SlcExecution slcExecution = new SlcExecution();
 		slcExecution.setUuid(UUID.randomUUID().toString());
@@ -226,7 +215,7 @@ public class ProcessBuilderView extends ViewPart {
 
 	}
 
-	// Handle Events
+	// Parameter view is updated each time a new line is selected
 	class SelectionChangedListener implements ISelectionChangedListener {
 		public void selectionChanged(SelectionChangedEvent evt) {
 
@@ -276,13 +265,12 @@ public class ProcessBuilderView extends ViewPart {
 				throw new SlcException(
 						"Cannot create batch on two (or more) distinct agents",
 						null);
-				// return false;
 			}
 
 			String fdXml = props.getProperty("RealizedFlowAsXml");
 			if (fdXml == null)
 				return false;
-			RealizedFlow rf = (RealizedFlow) oxmBean.unmarshal(fdXml);
+			RealizedFlow rf = null;//(RealizedFlow) oxmBean.unmarshal(fdXml);
 			realizedFlows.add(rf);
 			curSelectedRow = realizedFlows.indexOf(rf);
 			refreshParameterview();
@@ -302,9 +290,9 @@ public class ProcessBuilderView extends ViewPart {
 		this.slcAgents = slcAgents;
 	}
 
-	public void setOxmBean(OxmInterface oxmBean) {
-		this.oxmBean = oxmBean;
-	}
+//	public void setOxmBean(OxmInterface oxmBean) {
+//		this.oxmBean = oxmBean;
+//	}
 
 	public void setProcessController(ProcessController processController) {
 		this.processController = processController;