import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
import javax.jcr.Node;
+import javax.jcr.NodeIterator;
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;
+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;
import org.argeo.slc.jcr.SlcJcrConstants;
import org.argeo.slc.jcr.SlcNames;
import org.argeo.slc.jcr.SlcTypes;
-import org.eclipse.jface.fieldassist.SimpleContentProposalProvider;
-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.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;
public void createPartControl(Composite parent) {
viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
- ColumnViewerToolTipSupport.enableFor(viewer);
+
+ // FIXME : does not work in RAP, find a way to have it for RCP only
+ // ColumnViewerToolTipSupport.enableFor(viewer);
ViewContentProvider contentProvider = new ViewContentProvider(session);
viewer.setContentProvider(contentProvider);
+ viewer.setComparer(new NodeElementComparer());
final ViewLabelProvider viewLabelProvider = new ViewLabelProvider();
viewer.setLabelProvider(viewLabelProvider);
viewer.setInput(getViewSite());
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);
}
throws RepositoryException {
for (Iterator<Node> it = children.iterator(); it.hasNext();) {
Node node = it.next();
+ // execution spec definitions
if (node.getName().equals(SLC_EXECUTION_SPECS))
it.remove();
+ // flow values
+ else if (node.getParent().isNodeType(
+ SlcTypes.SLC_EXECUTION_FLOW))
+ it.remove();
}
return super.filterChildren(children);
}
+
+ @Override
+ public boolean hasChildren(Object element) {
+ if (element instanceof Node) {
+ Node node = (Node) element;
+ try {
+ if (node.isNodeType(SlcTypes.SLC_EXECUTION_FLOW))
+ return false;
+ } catch (RepositoryException e) {
+ throw new SlcException("Cannot check has children", e);
+ }
+ }
+ return super.hasChildren(element);
+ }
}
static class ViewComparator implements Comparator<Object> {
// }
class VmAgentObserver extends AsyncUiEventListener {
- protected void onEventInUiThread(EventIterator events) {
-// List<Node> 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<Event> events) {
+ for (Event event : events) {
+ try {
+ String path = event.getPath();
+
+ if (session.itemExists(path)) {
+ Node parentNode = session.getNode(path);// .getParent();
+ if (log.isDebugEnabled())
+ log.debug("Refresh " + parentNode);
+ viewer.refresh(parentNode);
+ }
+ } catch (RepositoryException e) {
+ log.warn("Cannot process event " + event + ": " + e);
+ }
+ }
// try {
// Node vmAgentNode = session
try {
if (obj instanceof Node) {
Node node = (Node) obj;
- if (node.isNodeType(SLC_EXECUTION_FLOW)) {
- List<String> paths = new ArrayList<String>();
- paths.add(node.getPath());
- IWorkbenchPage activePage = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage();
- activePage.openEditor(new ProcessEditorInput(paths,
- true), ProcessEditor.ID);
- } else if (node.isNodeType(SLC_EXECUTION_MODULE)) {
+ if (node.isNodeType(SLC_EXECUTION_MODULE)) {
String name = node.getProperty(SLC_NAME).getString();
String version = node.getProperty(SLC_VERSION)
.getString();
} else {
modulesManager.start(nameVersion);
}
+ } else {
+ String path = node.getPath();
+ // TODO factorize with editor
+ QueryManager qm = node.getSession().getWorkspace()
+ .getQueryManager();
+ String statement = "SELECT * FROM ["
+ + SlcTypes.SLC_EXECUTION_FLOW
+ + "] WHERE ISDESCENDANTNODE(['" + path
+ + "']) OR ISSAMENODE(['" + path + "'])";
+ // log.debug(statement);
+ Query query = qm.createQuery(statement, Query.JCR_SQL2);
+
+ // order paths
+ SortedSet<String> paths = new TreeSet<String>();
+ for (NodeIterator nit = query.execute().getNodes(); nit
+ .hasNext();) {
+ paths.add(nit.nextNode().getPath());
+ }
+
+ // List<String> paths = new ArrayList<String>();
+ // paths.add(node.getPath());
+ IWorkbenchPage activePage = PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage();
+ activePage.openEditor(new ProcessEditorInput(
+ new ArrayList<String>(paths), true),
+ ProcessEditor.ID);
}
}
} catch (Exception e) {
projects / gpl / argeo-slc.git / blobdiff