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=b33238e3cc4ea32b9f14f23931b3f8f6b30b5b54;hb=83996361545b06f97a85d20f3b5824af0a2c4904;hp=7e97d35e7325a9aac56e32b52827f70fed21a5a0;hpb=743b0b26b4c073fdd62ce3831d9e23247316fdab;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 7e97d35e7..b33238e3c 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 @@ -15,13 +15,15 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.jcr.nodetype.NodeType; import javax.jcr.observation.Event; -import javax.jcr.observation.EventIterator; import javax.jcr.query.Query; import javax.jcr.query.QueryManager; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.argeo.ArgeoException; import org.argeo.eclipse.ui.jcr.AsyncUiEventListener; import org.argeo.eclipse.ui.jcr.DefaultNodeLabelProvider; +import org.argeo.eclipse.ui.jcr.NodeElementComparer; import org.argeo.eclipse.ui.jcr.SimpleNodeContentProvider; import org.argeo.slc.BasicNameVersion; import org.argeo.slc.NameVersion; @@ -33,13 +35,16 @@ import org.argeo.slc.execution.ExecutionModulesManager; import org.argeo.slc.jcr.SlcJcrConstants; import org.argeo.slc.jcr.SlcNames; import org.argeo.slc.jcr.SlcTypes; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.ColumnViewerToolTipSupport; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.viewers.Viewer; import org.eclipse.swt.SWT; import org.eclipse.swt.dnd.DND; import org.eclipse.swt.dnd.DragSourceAdapter; @@ -48,6 +53,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.swt.widgets.Display; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; @@ -55,8 +61,8 @@ import org.eclipse.ui.part.ViewPart; /** JCR based view of the execution modules. */ public class JcrExecutionModulesView extends ViewPart implements SlcTypes, SlcNames { - // private final static Log log = LogFactory - // .getLog(JcrExecutionModulesView.class); + private final static Log log = LogFactory + .getLog(JcrExecutionModulesView.class); public static final String ID = "org.argeo.slc.client.ui.jcrExecutionModulesView"; @@ -68,15 +74,18 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes, public void createPartControl(Composite parent) { viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL); - + // FIXME : does not work in RAP, find a way to have it for RCP only - //ColumnViewerToolTipSupport.enableFor(viewer); + // ColumnViewerToolTipSupport.enableFor(viewer); ViewContentProvider contentProvider = new ViewContentProvider(session); viewer.setContentProvider(contentProvider); + viewer.setComparer(new NodeElementComparer()); final ViewLabelProvider viewLabelProvider = new ViewLabelProvider(); viewer.setLabelProvider(viewLabelProvider); + // FIXME fail on RAP put it in specific + ColumnViewerToolTipSupport.enableFor(viewer); viewer.setInput(getViewSite()); viewer.addDoubleClickListener(new ViewDoubleClickListener()); getViewSite().setSelectionProvider(viewer); @@ -87,19 +96,21 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes, viewer.addDragSupport(operations, tt, new ViewDragListener()); try { + String[] nodeTypes = { SlcTypes.SLC_AGENT, + SlcTypes.SLC_AGENT_FACTORY, SlcTypes.SLC_EXECUTION_MODULE }; session.getWorkspace() .getObservationManager() .addEventListener( - new VmAgentObserver(), + new VmAgentObserver(viewer.getTree().getDisplay()), Event.NODE_ADDED | Event.NODE_REMOVED | Event.NODE_MOVED, SlcJcrConstants.VM_AGENT_FACTORY_PATH, true, null, - null, false); + nodeTypes, false); } catch (RepositoryException e) { throw new SlcException("Cannot add observer", e); } } - + public void setFocus() { viewer.getControl().setFocus(); } @@ -231,39 +242,27 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes, // } class VmAgentObserver extends AsyncUiEventListener { - protected void onEventInUiThread(EventIterator events) { - // List baseNodes = ((SimpleNodeContentProvider) viewer - // .getContentProvider()).getBaseNodes(); - // Node baseNode = baseNodes.get(0); - // - // while (events.hasNext()) { - // Event event = events.nextEvent(); - // try { - // String path = event.getPath(); - // String baseNodePath = baseNode.getPath(); - // if (path.startsWith(baseNodePath)) { - // String relPath = path - // .substring(baseNodePath.length() + 1); - // log.debug("relPath: " + relPath); - // if (baseNode.hasNode(relPath)) { - // Node refreshNode = baseNode.getNode(relPath); - // log.debug("refreshNode: " + refreshNode); - // viewer.refresh(refreshNode); - // } - // - // } - // // if (log.isDebugEnabled()) - // // log.debug("Process " + path + ": " + event); - // - // // if (session.itemExists(path)) { - // // Node parentNode = session.getNode(path).getParent(); - // // log.debug("Parent: " + parentNode); - // // viewer.refresh(parentNode); - // // } - // } catch (RepositoryException e) { - // log.warn("Cannot process event " + event + ": " + e); - // } - // } + + public VmAgentObserver(Display display) { + super(display); + } + + protected void onEventInUiThread(List events) { + for (Event event : events) { + try { + String path = event.getPath(); + + if (session.itemExists(path)) { + Node parentNode = session.getNode(path);// .getParent(); + if (log.isTraceEnabled()) + log.trace("Refresh " + parentNode + " after event " + + event); + viewer.refresh(parentNode); + } + } catch (RepositoryException e) { + log.warn("Cannot process event " + event + ": " + e); + } + } // try { // Node vmAgentNode = session @@ -282,7 +281,10 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes, @Override protected String getText(Node node) throws RepositoryException { - if (node.getName().equals(SLC_EXECUTION_SPECS)) + if (node.isNodeType(NodeType.MIX_TITLE) + && node.hasProperty(Property.JCR_TITLE)) + return node.getProperty(Property.JCR_TITLE).getString(); + else if (node.getName().equals(SLC_EXECUTION_SPECS)) return "Execution Specifications"; else if (node.getPath().equals( SlcJcrConstants.VM_AGENT_FACTORY_PATH)) @@ -345,15 +347,33 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes, String name = node.getProperty(SLC_NAME).getString(); String version = node.getProperty(SLC_VERSION) .getString(); - NameVersion nameVersion = new BasicNameVersion(name, - version); + final NameVersion nameVersion = new BasicNameVersion( + name, version); Boolean started = node.getProperty(SLC_STARTED) .getBoolean(); + + Job job; if (started) { - modulesManager.stop(nameVersion); + job = new Job("Stop " + nameVersion) { + protected IStatus run(IProgressMonitor monitor) { + monitor.beginTask("Stop " + nameVersion, 1); + modulesManager.stop(nameVersion); + monitor.worked(1); + return Status.OK_STATUS; + } + }; } else { - modulesManager.start(nameVersion); + job = new Job("Start " + nameVersion) { + protected IStatus run(IProgressMonitor monitor) { + monitor.beginTask("Start " + nameVersion, 1); + modulesManager.start(nameVersion); + monitor.worked(1); + return Status.OK_STATUS; + } + }; } + job.setUser(true); + job.schedule(); } else { String path = node.getPath(); // TODO factorize with editor