Enhancements to TabContributions

[simantics/platform.git] / bundles / org.simantics.selectionview / src / org / simantics / selectionview / TypedVariableTabContribution.java

diff --git a/bundles/org.simantics.selectionview/src/org/simantics/selectionview/TypedVariableTabContribution.java b/bundles/org.simantics.selectionview/src/org/simantics/selectionview/TypedVariableTabContribution.java
index 68d6cdae48e66f1b0657ee605a022014cc573e89..10d4b465d44a487e364855eda0cce7f6e4c61fb5 100644 (file)
--- a/bundles/org.simantics.selectionview/src/org/simantics/selectionview/TypedVariableTabContribution.java
+++ b/bundles/org.simantics.selectionview/src/org/simantics/selectionview/TypedVariableTabContribution.java
@@ -108,13 +108,13 @@ public class TypedVariableTabContribution implements TabContribution<Object> {
                
                Layer0 L0 = Layer0.getInstance(graph);
                SelectionViewResources SEL = SelectionViewResources.getInstance(graph);
-               Collection<Resource> types = graph.getObjects(configuration, SEL.TypedVariableTabContribution_HasType);
+               Collection<Resource> types = graph.getObjects(configuration, SEL.TypedTabContribution_HasType);
                if(types.isEmpty()) throw new DatabaseException("No type for " + graph.getPossibleURI(configuration));
                Resource view = graph.getPossibleObject(configuration, SEL.VariableTabContribution_HasView);
                if(view == null) {
                        throw new DatabaseException("No view for " + graph.getPossibleURI(configuration));
                }
-               Integer priority = graph.getPossibleRelatedValue(configuration, SEL.VariableTabContribution_HasPriority, Bindings.INTEGER);
+               Integer priority = graph.getPossibleRelatedValue(configuration, SEL.TabContribution_HasPriority, Bindings.INTEGER);
                String label = graph.getPossibleRelatedValue(configuration, L0.HasLabel);
                final String viewURI = graph.getPossibleURI(view);
 
@@ -126,7 +126,7 @@ public class TypedVariableTabContribution implements TabContribution<Object> {
         
         if (!Collections.disjoint(types, ts)) {
 
-               for(Resource r : graph.getObjects(configuration, SEL.VariableTabContribution_HasTest)) {
+               for(Resource r : graph.getObjects(configuration, SEL.TabContribution_HasTest)) {
                        Boolean pass = Functions.exec(graph, r, graph, variable);
                        if(!pass) return;
                }