X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop%2Fsrc%2Forg%2Fsimantics%2Finterop%2Ftest%2FGraphComparatorViewer.java;h=5cbe6528cadbad754c848bf44ec53c89934cc303;hb=6baa14b70179cc336478223969214650cff9c83d;hp=d641c514e3ce092063787b09c8055396dd672d53;hpb=59059fb252346d13aa5f6d7d637ffabd915f20ae;p=simantics%2Finterop.git diff --git a/org.simantics.interop/src/org/simantics/interop/test/GraphComparatorViewer.java b/org.simantics.interop/src/org/simantics/interop/test/GraphComparatorViewer.java index d641c51..5cbe652 100644 --- a/org.simantics.interop/src/org/simantics/interop/test/GraphComparatorViewer.java +++ b/org.simantics.interop/src/org/simantics/interop/test/GraphComparatorViewer.java @@ -12,10 +12,30 @@ package org.simantics.interop.test; import java.io.IOException; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.action.IMenuCreator; +import org.eclipse.jface.action.IMenuListener; +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.action.MenuManager; +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.layout.GridDataFactory; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.util.IPropertyChangeListener; +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.ListViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.window.IShellProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.dnd.DND; import org.eclipse.swt.dnd.DropTarget; @@ -23,14 +43,23 @@ import org.eclipse.swt.dnd.DropTargetAdapter; import org.eclipse.swt.dnd.DropTargetEvent; import org.eclipse.swt.dnd.TextTransfer; import org.eclipse.swt.dnd.Transfer; +import org.eclipse.swt.events.HelpListener; +import org.eclipse.swt.events.MenuDetectEvent; +import org.eclipse.swt.events.MenuDetectListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Menu; +import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.part.ViewPart; import org.simantics.db.ReadGraph; @@ -39,22 +68,25 @@ import org.simantics.db.Session; import org.simantics.db.Statement; import org.simantics.db.common.ResourceArray; import org.simantics.db.common.request.ReadRequest; +import org.simantics.db.common.utils.NameUtils; import org.simantics.db.exception.DatabaseException; import org.simantics.db.exception.InvalidResourceReferenceException; import org.simantics.db.exception.ServiceException; import org.simantics.db.exception.ValidationException; import org.simantics.db.request.Read; import org.simantics.db.service.SerialisationSupport; -import org.simantics.layer0.utils.direct.GraphUtils; +import org.simantics.layer0.Layer0; import org.simantics.ui.SimanticsUI; import org.simantics.ui.dnd.LocalObjectTransfer; import org.simantics.ui.dnd.ResourceReferenceTransfer; import org.simantics.ui.dnd.ResourceTransferUtils; import org.simantics.ui.utils.ResourceAdaptionUtils; import org.simantics.utils.datastructures.BijectionMap; +import org.simantics.utils.datastructures.Pair; +import org.simantics.utils.ui.ExceptionUtils; /** - * Simple multi line text viewer for seeing differences in two subgraphs. + * Simple multiline text viewer for seeing differences in two subgraphs. * * @author Marko Luukkainen * @@ -71,7 +103,13 @@ public class GraphComparatorViewer extends ViewPart{ private Text text1; private Text text2; - private GraphComparator comparator = new GraphComparator(); + + private List traversed = new ArrayList(); + private List tested = new ArrayList(); + private List strong = new ArrayList(); + private List nonTraversed = new ArrayList(); + private List nonTested = new ArrayList(); + @Override public void createPartControl(Composite parent) { @@ -101,9 +139,37 @@ public class GraphComparatorViewer extends ViewPart{ } }); + defaultConf(); + + getViewSite().getActionBars().getToolBarManager().add(new Action("Config") { + @Override + public void run() { + ConfigurationDialog dialog = new ConfigurationDialog(getSite().getShell()); + dialog.open(); + } + }); + } - + private void defaultConf() { + traversed.clear(); + tested.clear(); + strong.clear(); + nonTested.clear(); + nonTraversed.clear(); + try { + session.syncRequest(new ReadRequest() { + @Override + public void run(ReadGraph graph) throws DatabaseException { + Layer0 l0 = Layer0.getInstance(graph); + traversed.add(l0.ConsistsOf); + tested.add(l0.IsWeaklyRelatedTo); + } + }); + } catch (Exception e) { + ExceptionUtils.logAndShowError(e); + } + } private void compare() { text1.setText(""); @@ -122,27 +188,81 @@ public class GraphComparatorViewer extends ViewPart{ @Override public void run(final ReadGraph graph) throws DatabaseException { - comparator.clearRels(); - comparator.addTraversed(graph.getBuiltins().ConsistsOf); - comparator.addTested(graph.getBuiltins().IsWeaklyRelatedTo); - comparator.test(graph, r1, r2); - BijectionMap map = comparator.getComparable(); + GraphComparator comparator = new GraphComparator(r1,r2); + + comparator.addTested(tested); + comparator.addTraversed(traversed); + comparator.addNonTested(nonTested); + comparator.addNonTraversed(nonTraversed); + comparator.addStrong(strong); + + comparator.test(graph); + BijectionMap map = comparator.getComparableStatements(); Map indices = new HashMap(); final StringBuilder sb1 = new StringBuilder(); + final StringBuilder sb2 = new StringBuilder(); int index = 0; - for (Statement s : comparator.getChanges1()) { + + GraphChanges changes = comparator.getChanges(); + + for (Pair mod : changes.getModifications()) { + { + String sub; + try { + Statement s = mod.first; + sub = NameUtils.getSafeName(graph, s.getSubject()); + String pre = NameUtils.getSafeName(graph, s.getPredicate()); + String obj = NameUtils.getSafeName(graph, s.getObject()); + if (map.containsLeft(s)) { + index++; + indices.put(s, index); + sb1.append("["+index + "] "); + } + sb1.append(sub + " - " + pre + " - " + obj); + sb1.append(" ["+s.getSubject().getResourceId() + " " + s.getPredicate().getResourceId() + " " + s.getObject().getResourceId()+"]"); + sb1.append("\n"); + } catch (ValidationException e) { + e.printStackTrace(); + } catch (ServiceException e) { + e.printStackTrace(); + } + } + { + String sub; + try { + Statement s = mod.second; + sub = NameUtils.getSafeName(graph, s.getSubject()); + String pre = NameUtils.getSafeName(graph, s.getPredicate()); + String obj = NameUtils.getSafeName(graph, s.getObject()); + if (map.containsRight(s)) { + index = indices.get(map.getLeft(s)); + sb2.append("["+index + "] "); + } + sb2.append(sub + " - " + pre + " - " + obj); + sb2.append(" ["+s.getSubject().getResourceId() + " " + s.getPredicate().getResourceId() + " " + s.getObject().getResourceId()+"]"); + sb2.append("\n"); + } catch (ValidationException e) { + e.printStackTrace(); + } catch (ServiceException e) { + e.printStackTrace(); + } + } + } + for (Statement s : changes.getDeletions()) { String sub; try { - sub = GraphUtils.getReadableName(graph, s.getSubject()); - String pre = GraphUtils.getReadableName(graph, s.getPredicate()); - String obj = GraphUtils.getReadableName(graph, s.getObject()); + sub = NameUtils.getSafeName(graph, s.getSubject()); + String pre = NameUtils.getSafeName(graph, s.getPredicate()); + String obj = NameUtils.getSafeName(graph, s.getObject()); if (map.containsLeft(s)) { index++; indices.put(s, index); sb1.append("["+index + "] "); } - sb1.append(sub + " - " + pre + " - " + obj + "\n"); + sb1.append(sub + " - " + pre + " - " + obj); + sb1.append(" ["+s.getSubject().getResourceId() + " " + s.getPredicate().getResourceId() + " " + s.getObject().getResourceId()+"]"); + sb1.append("\n"); } catch (ValidationException e) { e.printStackTrace(); } catch (ServiceException e) { @@ -150,18 +270,20 @@ public class GraphComparatorViewer extends ViewPart{ } } - final StringBuilder sb2 = new StringBuilder(); - for (Statement s : comparator.getChanges2()) { + + for (Statement s : changes.getAdditions()) { String sub; try { - sub = GraphUtils.getReadableName(graph, s.getSubject()); - String pre = GraphUtils.getReadableName(graph, s.getPredicate()); - String obj = GraphUtils.getReadableName(graph, s.getObject()); + sub = NameUtils.getSafeName(graph, s.getSubject()); + String pre = NameUtils.getSafeName(graph, s.getPredicate()); + String obj = NameUtils.getSafeName(graph, s.getObject()); if (map.containsRight(s)) { index = indices.get(map.getLeft(s)); sb2.append("["+index + "] "); } - sb2.append(sub + " - " + pre + " - " + obj + "\n"); + sb2.append(sub + " - " + pre + " - " + obj); + sb2.append(" ["+s.getSubject().getResourceId() + " " + s.getPredicate().getResourceId() + " " + s.getObject().getResourceId()+"]"); + sb2.append("\n"); } catch (ValidationException e) { e.printStackTrace(); } catch (ServiceException e) { @@ -235,7 +357,7 @@ public class GraphComparatorViewer extends ViewPart{ @Override public String perform(ReadGraph graph) throws DatabaseException { - return GraphUtils.getReadableName(graph, r); + return NameUtils.getSafeName(graph, r); } })); } catch (DatabaseException e) { @@ -269,7 +391,253 @@ public class GraphComparatorViewer extends ViewPart{ + private class ConfigurationDialog extends Dialog { + + protected ConfigurationDialog(Shell parentShell) { + super(parentShell); + } + + @Override + protected void createButtonsForButtonBar(Composite parent) { + createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, + true); + } + + @Override + protected Control createDialogArea(Composite parent) { + Composite composite = (Composite) super.createDialogArea(parent); + composite.setLayout(new FillLayout(SWT.VERTICAL)); + + Group group = new Group(composite, SWT.NONE); + group.setText("Traversed"); + group.setLayout(new FillLayout()); + ListViewer traversedViewer = new ListViewer(group); + + group = new Group(composite, SWT.NONE); + group.setText("Tested"); + group.setLayout(new FillLayout()); + ListViewer testedViewer = new ListViewer(group); + + group = new Group(composite, SWT.NONE); + group.setText("Strong"); + group.setLayout(new FillLayout()); + ListViewer strongViewer = new ListViewer(group); + + group = new Group(composite, SWT.NONE); + group.setText("NonTraversed"); + group.setLayout(new FillLayout()); + ListViewer nonTraversedViewer = new ListViewer(group); + + group = new Group(composite, SWT.NONE); + group.setText("NonTested"); + group.setLayout(new FillLayout()); + ListViewer nonTestedViewer = new ListViewer(group); + + traversedViewer.setContentProvider(new ResourceListContentProvider()); + traversedViewer.setLabelProvider(new ResourceLabelProvider()); + + testedViewer.setContentProvider(new ResourceListContentProvider()); + testedViewer.setLabelProvider(new ResourceLabelProvider()); + + strongViewer.setContentProvider(new ResourceListContentProvider()); + strongViewer.setLabelProvider(new ResourceLabelProvider()); + + nonTraversedViewer.setContentProvider(new ResourceListContentProvider()); + nonTraversedViewer.setLabelProvider(new ResourceLabelProvider()); + + nonTestedViewer.setContentProvider(new ResourceListContentProvider()); + nonTestedViewer.setLabelProvider(new ResourceLabelProvider()); + + MenuManager strongManager = new MenuManager(); + strongManager.setRemoveAllWhenShown(true); + strongManager.addMenuListener(new ListPopupListener(strongViewer)); + strongViewer.getControl().setMenu(strongManager.createContextMenu(strongViewer.getControl())); + + MenuManager nonTestedManager = new MenuManager(); + nonTestedManager.setRemoveAllWhenShown(true); + nonTestedManager.addMenuListener(new ListPopupListener(nonTestedViewer)); + nonTestedViewer.getControl().setMenu(nonTestedManager.createContextMenu(nonTestedViewer.getControl())); + + MenuManager nonTraversedManager = new MenuManager(); + nonTraversedManager.setRemoveAllWhenShown(true); + nonTraversedManager.addMenuListener(new ListPopupListener(nonTraversedViewer)); + nonTraversedViewer.getControl().setMenu(nonTraversedManager.createContextMenu(nonTraversedViewer.getControl())); + + MenuManager testedManager = new MenuManager(); + testedManager.setRemoveAllWhenShown(true); + testedManager.addMenuListener(new ListPopupListener(testedViewer)); + testedViewer.getControl().setMenu(testedManager.createContextMenu(testedViewer.getControl())); + + MenuManager traversedManager = new MenuManager(); + traversedManager.setRemoveAllWhenShown(true); + traversedManager.addMenuListener(new ListPopupListener(traversedViewer)); + traversedViewer.getControl().setMenu(traversedManager.createContextMenu(traversedViewer.getControl())); + + traversedViewer.setInput(traversed); + testedViewer.setInput(tested); + strongViewer.setInput(strong); + nonTestedViewer.setInput(nonTested); + nonTraversedViewer.setInput(nonTraversed); + + return composite; + } + + } + + private class ListPopupListener implements IMenuListener { + private ListViewer viewer; + + public ListPopupListener(ListViewer viewer) { + this.viewer = viewer; + } + + @Override + public void menuAboutToShow(IMenuManager manager) { + IStructuredSelection s = (IStructuredSelection)viewer.getSelection(); + List list = (List)viewer.getInput(); + manager.add(new AddAction(viewer, list)); + if (!s.isEmpty()) { + Object element = s.getFirstElement(); + manager.add(new DeleteAction(viewer, list, element)); + } + + } + } + + private class DeleteAction extends Action { + private Viewer viewer; + private List list; + private Object obj; + public DeleteAction(Viewer viewer, List list, Object obj) { + super("Delete"); + this.list = list; + this.obj = obj; + this.viewer = viewer; + } + + @Override + public void run() { + list.remove(obj); + viewer.refresh(); + } + } + + private class AddAction extends Action { + private Viewer viewer; + private List list; + public AddAction(Viewer viewer, List list) { + super("Add"); + this.list = list; + this.viewer = viewer; + } + + @Override + public void run() { + RelationChooseDialog dialog = new RelationChooseDialog(getSite().getShell()); + if (dialog.open() == RelationChooseDialog.OK) { + final String uri = dialog.getUri(); + try { + Resource res = session.syncRequest(new Read() { + @Override + public Resource perform(ReadGraph graph) + throws DatabaseException { + try { + return graph.getResource(uri); + } catch (Exception e) { + return null; + } + } + }); + if (res != null) { + list.add(res); + viewer.refresh(); + } else { + MessageDialog.openError(getSite().getShell(), "Error", "Relation '" + uri + "' not found."); + } + } catch (Exception e) { + + } + + + } + + } + } + + private class RelationChooseDialog extends Dialog { + + private String uri = null; + private Text text; + public RelationChooseDialog(IShellProvider parentShell) { + super(parentShell); + } + + public RelationChooseDialog(Shell parentShell) { + super(parentShell); + } + + @Override + protected Control createDialogArea(Composite parent) { + Composite composite = (Composite) super.createDialogArea(parent); + composite.setLayout(new GridLayout(2, false)); + Label label = new Label(composite, SWT.NONE); + label.setText("URI:"); + + text = new Text(composite, SWT.SINGLE | SWT.BORDER); + text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); + + return composite; + } + + @Override + protected void okPressed() { + uri = text.getText(); + super.okPressed(); + } + + public String getUri() { + return uri; + } + + } + private class ResourceListContentProvider implements IStructuredContentProvider { + + @SuppressWarnings("unchecked") + @Override + public Object[] getElements(Object inputElement) { + List list = (List)inputElement; + return list.toArray(); + } + + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + + } + + @Override + public void dispose() { + + } + } + private class ResourceLabelProvider extends LabelProvider { + + @Override + public String getText(Object element) { + final Resource res = (Resource) element; + try { + return session.syncRequest(new Read() { + @Override + public String perform(ReadGraph graph) throws DatabaseException { + return NameUtils.getSafeName(graph, res); + } + }); + } catch (DatabaseException e) { + return "Error: " + e.getMessage(); + } + } + + } }