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=e5696ee9e652a8a10d3ae346e7377e4e4eab502c;hb=3781dcd363f0f6265fae0ac758fd40cf4254ebc9;hp=59157a3702bfb5a6d3fab4ebe3364786603a5b5d;hpb=12419f46844753798cd1b1eab3a7379611f25e47;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 59157a370..e5696ee9e 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
@@ -9,6 +9,7 @@ import javax.jcr.Node;
 import javax.jcr.Property;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
+import javax.jcr.nodetype.NodeType;
 import javax.jcr.observation.Event;
 import javax.jcr.observation.EventIterator;
 
@@ -103,17 +104,19 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 					new String[] { SlcJcrConstants.VM_AGENT_FACTORY_PATH });
 		}
 
-//		@Override
-//		protected Object[] getChildren(Node node) throws RepositoryException {
-//			if (node.isNodeType(SlcTypes.SLC_AGENT_FACTORY)) {
-//				List<AgentNodesWrapper> wrappers = new ArrayList<AgentNodesWrapper>();
-//				for (NodeIterator nit = node.getNodes(); nit.hasNext();) {
-//					wrappers.add(new AgentNodesWrapper(nit.nextNode()));
-//				}
-//				return wrappers.toArray();
-//			}
-//			return super.getChildren(node);
-//		}
+		// @Override
+		// protected Object[] getChildren(Node node) throws RepositoryException
+		// {
+		// if (node.isNodeType(SlcTypes.SLC_AGENT_FACTORY)) {
+		// List<AgentNodesWrapper> wrappers = new
+		// ArrayList<AgentNodesWrapper>();
+		// for (NodeIterator nit = node.getNodes(); nit.hasNext();) {
+		// wrappers.add(new AgentNodesWrapper(nit.nextNode()));
+		// }
+		// return wrappers.toArray();
+		// }
+		// return super.getChildren(node);
+		// }
 
 		@Override
 		protected Object[] sort(Object parent, Object[] children) {
@@ -131,6 +134,12 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 				if (o1 instanceof Node && o2 instanceof Node) {
 					Node node1 = (Node) o1;
 					Node node2 = (Node) o2;
+
+					if (node1.getName().equals(SLC_EXECUTION_SPECS))
+						return -100;
+					if (node2.getName().equals(SLC_EXECUTION_SPECS))
+						return 100;
+
 					if (node1.isNodeType(SLC_EXECUTION_FLOW)
 							&& node2.isNodeType(SLC_EXECUTION_FLOW)) {
 						return node1.getName().compareTo(node2.getName());
@@ -154,27 +163,27 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 
 	}
 
-//	/** Wraps the execution modules of an agent. */
-//	static class AgentNodesWrapper extends NodesWrapper {
-//
-//		public AgentNodesWrapper(Node node) {
-//			super(node);
-//		}
-//
-//		protected List<WrappedNode> getWrappedNodes()
-//				throws RepositoryException {
-//			List<WrappedNode> children = new ArrayList<WrappedNode>();
-//			Node executionModules = getNode();
-//			for (NodeIterator nit = executionModules.getNodes(); nit.hasNext();) {
-//				for (NodeIterator nitVersions = nit.nextNode().getNodes(); nitVersions
-//						.hasNext();) {
-//					children.add(new WrappedNode(this, nitVersions.nextNode()));
-//				}
-//			}
-//			return children;
-//		}
-//
-//	}
+	// /** Wraps the execution modules of an agent. */
+	// static class AgentNodesWrapper extends NodesWrapper {
+	//
+	// public AgentNodesWrapper(Node node) {
+	// super(node);
+	// }
+	//
+	// protected List<WrappedNode> getWrappedNodes()
+	// throws RepositoryException {
+	// List<WrappedNode> children = new ArrayList<WrappedNode>();
+	// Node executionModules = getNode();
+	// for (NodeIterator nit = executionModules.getNodes(); nit.hasNext();) {
+	// for (NodeIterator nitVersions = nit.nextNode().getNodes(); nitVersions
+	// .hasNext();) {
+	// children.add(new WrappedNode(this, nitVersions.nextNode()));
+	// }
+	// }
+	// return children;
+	// }
+	//
+	// }
 
 	class VmAgentObserver extends AsyncUiEventListener {
 		protected void onEventInUiThread(EventIterator events) {
@@ -184,32 +193,56 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 
 	class ViewLabelProvider extends DefaultNodeLabelProvider implements
 			ITableLabelProvider {
-		public String getColumnText(Object obj, int index) {
-			return getText(obj);
-		}
 
-		public Image getColumnImage(Object obj, int index) {
-			return getImage(obj);
+		@Override
+		protected String getText(Node node) throws RepositoryException {
+			if (node.getName().equals(SLC_EXECUTION_SPECS))
+				return "Execution Specifications";
+			else if (node.getPath().equals(
+					SlcJcrConstants.VM_AGENT_FACTORY_PATH))
+				return "Internal Agents";
+			return super.getText(node);
 		}
 
+		@Override
 		public Image getImage(Node node) throws RepositoryException {
-			if (node.isNodeType(SlcTypes.SLC_AGENT))
-				return SlcImages.AGENT;
-			else if (node.isNodeType(SlcTypes.SLC_MODULE))
-				return SlcImages.MODULE;
+			// we try to optimize a bit by putting deeper nodes first
+			if (node.getParent().isNodeType(
+					SlcTypes.SLC_EXECUTION_SPEC_ATTRIBUTE))
+				return SlcImages.CHOICES;
+			else if (node.isNodeType(SlcTypes.SLC_EXECUTION_SPEC_ATTRIBUTE))
+				return SlcImages.EXECUTION_SPEC_ATTRIBUTE;
+			else if (node.isNodeType(SlcTypes.SLC_EXECUTION_SPEC))
+				return SlcImages.EXECUTION_SPEC;
+			else if (node.getName().equals(SLC_EXECUTION_SPECS))
+				return SlcImages.EXECUTION_SPECS;
 			else if (node.isNodeType(SlcTypes.SLC_EXECUTION_FLOW))
 				return SlcImages.FLOW;
+			else if (node.isNodeType(SlcTypes.SLC_MODULE))
+				return SlcImages.MODULE;
+			else if (node.isNodeType(SlcTypes.SLC_AGENT))
+				return SlcImages.AGENT;
+			else if (node.isNodeType(SlcTypes.SLC_AGENT_FACTORY))
+				return SlcImages.AGENT_FACTORY;
 			else
 				return SlcImages.FOLDER;
 		}
 
 		public String getToolTipText(Node node) throws RepositoryException {
-			if (node.isNodeType(SlcTypes.SLC_MODULE)
+			if (node.isNodeType(NodeType.MIX_TITLE)
 					&& node.hasProperty(Property.JCR_DESCRIPTION))
 				return node.getProperty(Property.JCR_DESCRIPTION).getString();
 			return super.getToolTipText(node);
 		}
 
+		public String getColumnText(Object obj, int index) {
+			return getText(obj);
+		}
+
+		public Image getColumnImage(Object obj, int index) {
+			return getImage(obj);
+		}
+
 	}
 
 	class ViewDoubleClickListener implements IDoubleClickListener {