Better support for ontological profiles

[simantics/platform.git] / bundles / org.simantics.diagram.profile / src / org / simantics / diagram / profile / view / RemoveEntriesAction.java

diff --git a/bundles/org.simantics.diagram.profile/src/org/simantics/diagram/profile/view/RemoveEntriesAction.java b/bundles/org.simantics.diagram.profile/src/org/simantics/diagram/profile/view/RemoveEntriesAction.java
index 0e51deac1225d2a6ae6744e9849ecaf8748de202..f83bbf928f76bf7678f6bc70d1ad297b70ccaa0c 100644 (file)
--- a/bundles/org.simantics.diagram.profile/src/org/simantics/diagram/profile/view/RemoveEntriesAction.java
+++ b/bundles/org.simantics.diagram.profile/src/org/simantics/diagram/profile/view/RemoveEntriesAction.java
@@ -23,9 +23,8 @@ public class RemoveEntriesAction extends ModelledActionImpl<Resource> {
        public void run(Resource runtimeDiagram) {
 
                ISelection selection = getParameter(DiagramResource.URIs.ProfilesView_SelectedEntries);
-        final List<ResourcePair> selectedEntries = ISelectionUtils.getPossibleKeys(selection, SelectionHints.KEY_MAIN, ResourcePair.class);
+        final List<ProfileTuple> selectedEntries = ISelectionUtils.getPossibleKeys(selection, SelectionHints.KEY_MAIN, ProfileTuple.class);
         if(selectedEntries != null && !selectedEntries.isEmpty()) {
-               System.err.println("RemoveEntriesAction has " + selection + " for " + runtimeDiagram);
             try {
                 Simantics.getSession().syncRequest(new WriteRequest() {
 
@@ -33,9 +32,9 @@ public class RemoveEntriesAction extends ModelledActionImpl<Resource> {
                     public void perform(WriteGraph graph) throws DatabaseException {
                        
                        DiagramResource DIA = DiagramResource.getInstance(graph);
-                       for(ResourcePair entry : selectedEntries) {
-                               Resource list = graph.getPossibleObject(entry.getFirst(), DIA.HasEntries);
-                               OrderedSetUtils.remove(graph, list, entry.getSecond());
+                       for(ProfileTuple entry : selectedEntries) {
+                               Resource list = graph.getPossibleObject(entry.getBaseProfile(), DIA.HasEntries);
+                               OrderedSetUtils.remove(graph, list, entry.getEntry());
                        }
                         
                     }