From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 9 Nov 2016 22:23:08 +0000 (+0200)
Subject: Merge commit '31664b6'
X-Git-Tag: v1.25.0~55
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=bb5a3edf299cb943999c72c69dd68fb740c8a506;hp=8eeb0657ef6613c55f5918c66618b1f4cc10a5ef;p=simantics%2Fplatform.git

Merge commit '31664b6'

Sync git svn branch with SVN repository r33382.

refs #6803
[PRIVATE-12714]
---

diff --git a/bundles/org.simantics.annotation.ontology/graph.tg b/bundles/org.simantics.annotation.ontology/graph.tg
index 2a28024a3..2898f0084 100644
Binary files a/bundles/org.simantics.annotation.ontology/graph.tg and b/bundles/org.simantics.annotation.ontology/graph.tg differ
diff --git a/bundles/org.simantics.annotation.ontology/graph/Annotation.pgraph b/bundles/org.simantics.annotation.ontology/graph/Annotation.pgraph
index 09b40fcc2..2a9827acb 100644
--- a/bundles/org.simantics.annotation.ontology/graph/Annotation.pgraph
+++ b/bundles/org.simantics.annotation.ontology/graph/Annotation.pgraph
@@ -20,6 +20,10 @@ ANNO.Functions : L0.Library
 
 ANNO.AnnotationType <T L0.Type : MOD.TypeWithChangeInformation
     L0.HasDescription "An entity consisting of arbitrary properties."
+    >-- ANNO.AnnotationType.systemAnnotation ==> "Boolean" <R L0.HasProperty : L0.FunctionalRelation : SEL.GenericParameterType
+        L0.HasLabel "Is System Annotation?"
+        L0.HasDescription "If true, this annotation type and its instances should be hidden from user interfaces while still allowing programmatic use."
+    @L0.assert ANNO.AnnotationType.systemAnnotation true
 
 ANNO.Annotation <T L0.Value : ANNO.AnnotationType : MOD.TypeWithChangeInformation
     L0.HasDescription "Abstract base class for annotation object types."
diff --git a/bundles/org.simantics.annotation.ontology/src/org/simantics/annotation/ontology/AnnotationResource.java b/bundles/org.simantics.annotation.ontology/src/org/simantics/annotation/ontology/AnnotationResource.java
index f2fb52856..a9b49aca4 100644
--- a/bundles/org.simantics.annotation.ontology/src/org/simantics/annotation/ontology/AnnotationResource.java
+++ b/bundles/org.simantics.annotation.ontology/src/org/simantics/annotation/ontology/AnnotationResource.java
@@ -25,6 +25,8 @@ public class AnnotationResource {
     @Deprecated public final Resource AnnotationTypeLibrary;
     @Deprecated public final Resource AnnotationTypeLibraryUI;
     @Deprecated public final Resource AnnotationTypeUI;
+    public final Resource AnnotationType_systemAnnotation;
+    public final Resource AnnotationType_systemAnnotation_Inverse;
     @Deprecated public final Resource AnnotationUI;
     public final Resource Annotation_HasEntry;
     public final Resource Annotation_HasEntry_Inverse;
@@ -84,6 +86,8 @@ public class AnnotationResource {
         @Deprecated public static final String AnnotationTypeLibrary = "http://www.simantics.org/Annotation-1.0/AnnotationTypeLibrary";
         @Deprecated public static final String AnnotationTypeLibraryUI = "http://www.simantics.org/Annotation-1.0/AnnotationTypeLibraryUI";
         @Deprecated public static final String AnnotationTypeUI = "http://www.simantics.org/Annotation-1.0/AnnotationTypeUI";
+        public static final String AnnotationType_systemAnnotation = "http://www.simantics.org/Annotation-1.0/AnnotationType/systemAnnotation";
+        public static final String AnnotationType_systemAnnotation_Inverse = "http://www.simantics.org/Annotation-1.0/AnnotationType/systemAnnotation/Inverse";
         @Deprecated public static final String AnnotationUI = "http://www.simantics.org/Annotation-1.0/AnnotationUI";
         public static final String Annotation_HasEntry = "http://www.simantics.org/Annotation-1.0/Annotation/HasEntry";
         public static final String Annotation_HasEntry_Inverse = "http://www.simantics.org/Annotation-1.0/Annotation/HasEntry/Inverse";
@@ -153,6 +157,8 @@ public class AnnotationResource {
         AnnotationTypeLibrary = getResourceOrNull(graph, URIs.AnnotationTypeLibrary);
         AnnotationTypeLibraryUI = getResourceOrNull(graph, URIs.AnnotationTypeLibraryUI);
         AnnotationTypeUI = getResourceOrNull(graph, URIs.AnnotationTypeUI);
+        AnnotationType_systemAnnotation = getResourceOrNull(graph, URIs.AnnotationType_systemAnnotation);
+        AnnotationType_systemAnnotation_Inverse = getResourceOrNull(graph, URIs.AnnotationType_systemAnnotation_Inverse);
         AnnotationUI = getResourceOrNull(graph, URIs.AnnotationUI);
         Annotation_HasEntry = getResourceOrNull(graph, URIs.Annotation_HasEntry);
         Annotation_HasEntry_Inverse = getResourceOrNull(graph, URIs.Annotation_HasEntry_Inverse);
diff --git a/bundles/org.simantics.annotation.ui/src/org/simantics/annotation/ui/AnnotationUtils.java b/bundles/org.simantics.annotation.ui/src/org/simantics/annotation/ui/AnnotationUtils.java
index 3bc50dae9..2abd2d670 100644
--- a/bundles/org.simantics.annotation.ui/src/org/simantics/annotation/ui/AnnotationUtils.java
+++ b/bundles/org.simantics.annotation.ui/src/org/simantics/annotation/ui/AnnotationUtils.java
@@ -101,9 +101,9 @@ public class AnnotationUtils {
 		return Pair.make(property, type);
 	}
 
-	public static void newAnnotation(ReadGraph graph, final Resource parent, Resource model) throws DatabaseException {
+	public static void newAnnotation(ReadGraph graph, Resource parent, Resource model) throws DatabaseException {
 
-        final Map<Resource, Pair<String, ImageDescriptor>> map = new HashMap<Resource, Pair<String,ImageDescriptor>>();
+        Map<Resource, Pair<String, ImageDescriptor>> map = new HashMap<>();
         findAnnotationTypes(graph, model, map);
         findAnnotations(graph, model, map);
         queryUserSelectedAnnotationType(map, selected -> {
@@ -130,9 +130,9 @@ public class AnnotationUtils {
     	}
 	}
 	
-	public static void newAnnotation(ReadGraph graph, final Variable position, Resource model) throws DatabaseException {
+	public static void newAnnotation(ReadGraph graph, Variable position, Resource model) throws DatabaseException {
 
-        final Map<Resource, Pair<String, ImageDescriptor>> map = new HashMap<Resource, Pair<String,ImageDescriptor>>();
+        Map<Resource, Pair<String, ImageDescriptor>> map = new HashMap<>();
         findAnnotationTypes(graph, model, map);
         findAnnotations(graph, model, map);
         queryUserSelectedAnnotationType(map, selected -> {
@@ -163,7 +163,7 @@ public class AnnotationUtils {
 	 * @param model
 	 * @throws DatabaseException
 	 */
-	public static void newAnnotation(final Resource parent, final Resource model) throws DatabaseException {
+	public static void newAnnotation(Resource parent, Resource model) throws DatabaseException {
 		if (model == null)
 			return;
 		Simantics.getSession().syncRequest(new ReadRequest() {
@@ -174,7 +174,7 @@ public class AnnotationUtils {
 		});
 	}
 
-	public static void newAnnotation(final Resource parent) throws DatabaseException {
+	public static void newAnnotation(Resource parent) throws DatabaseException {
         Simantics.getSession().syncRequest(new ReadRequest() {
             @Override
             public void run(ReadGraph graph) throws DatabaseException {
@@ -185,7 +185,7 @@ public class AnnotationUtils {
         });
 	}
 
-	public static void newAnnotation(final Variable position) throws DatabaseException {
+	public static void newAnnotation(Variable position) throws DatabaseException {
         Simantics.getSession().syncRequest(new ReadRequest() {
             @Override
             public void run(ReadGraph graph) throws DatabaseException {
@@ -196,14 +196,13 @@ public class AnnotationUtils {
         });
 	}
 
-	public static void newAnnotationInstance(final Resource parent, final Resource model) throws DatabaseException {
+	public static void newAnnotationInstance(Resource parent, Resource model) throws DatabaseException {
         if (model == null)
             return;
         Simantics.getSession().syncRequest(new ReadRequest() {
             @Override
             public void run(ReadGraph graph) throws DatabaseException {
-                
-                final Map<Resource, Pair<String, ImageDescriptor>> map = new HashMap<Resource, Pair<String,ImageDescriptor>>();
+                Map<Resource, Pair<String, ImageDescriptor>> map = new HashMap<>();
                 findAnnotationTypes(graph, model, map);
                 queryUserSelectedAnnotationType(map, selected -> {
                     Simantics.getSession().async(new WriteRequest() {
@@ -240,6 +239,11 @@ public class AnnotationUtils {
 			if (graph.hasStatement(_res, L0.Abstract))
 				continue;
 
+			// Don't allow instantiation of non-user-selectable annotation types
+			Boolean userSelectable = graph.getPossibleRelatedValue2(_res, ANNO.AnnotationType_systemAnnotation, Bindings.BOOLEAN);
+			if (Boolean.TRUE.equals(userSelectable))
+				continue;
+
 			Resource res = graph.getPossibleObject(_res, L0.HasRange_Inverse);
 			if(res == null) {
 				
@@ -265,7 +269,7 @@ public class AnnotationUtils {
 
 				name = name + " - " + URIStringUtils.unescape(parentURI);
 
-				map.put(_res, new Pair<String, ImageDescriptor>(name, descriptor));
+				map.put(_res, Pair.make(name, descriptor));
 				
 			} else {
 				
@@ -291,7 +295,7 @@ public class AnnotationUtils {
 
 				name = name + " - " + URIStringUtils.unescape(parentURI);
 
-				map.put(_res, new Pair<String, ImageDescriptor>(name, descriptor));
+				map.put(_res, Pair.make(name, descriptor));
 			
 			}
 			
@@ -311,8 +315,6 @@ public class AnnotationUtils {
         ImageDescriptor descriptor = graph.adapt(ANNO.Images_Annotation, ImageDescriptor.class);
 
         for(Resource _res : query.find(graph, model)) {
-            // Don't allow instantiation of abstract annotation types.
-
             String name = graph.getPossibleRelatedValue(_res, L0.HasName, Bindings.STRING);
             if (name == null)
                 continue;
@@ -334,8 +336,13 @@ public class AnnotationUtils {
 
             Resource type = graph.getPossibleType(_res, ANNO.Annotation);
             if(type != null) {
-            	Resource relation = graph.getPossibleObject(type, L0.HasRange_Inverse);
-            	if(relation != null) {
+                // Don't list instances of non-user-selectable annotation types
+                Boolean userSelectable = graph.getPossibleRelatedValue2(type, ANNO.AnnotationType_systemAnnotation, Bindings.BOOLEAN);
+                if (Boolean.TRUE.equals(userSelectable))
+                    continue;
+
+                Resource relation = graph.getPossibleObject(type, L0.HasRange_Inverse);
+                if(relation != null) {
                     String rName = graph.getPossibleRelatedValue(relation, L0.HasName, Bindings.STRING);
                     if(rName != null) {
                     	name = name + " - " + rName;
@@ -345,7 +352,7 @@ public class AnnotationUtils {
             
             name = name + " - " + URIStringUtils.unescape(parentURI);
             
-            map.put(_res, new Pair<String, ImageDescriptor>(name, descriptor));
+            map.put(_res, Pair.make(name, descriptor));
             
         }
 
@@ -380,7 +387,7 @@ public class AnnotationUtils {
     			@Override
     			public Map<Resource, Pair<String, ImageDescriptor>> perform(ReadGraph graph) throws DatabaseException {
 
-    				Map<Resource, Pair<String, ImageDescriptor>> result = new HashMap<Resource, Pair<String,ImageDescriptor>>();
+    				Map<Resource, Pair<String, ImageDescriptor>> result = new HashMap<>();
 
     				Layer0 L0 = Layer0.getInstance(graph);
     				AnnotationResource ANNO = AnnotationResource.getInstance(graph);
@@ -399,7 +406,7 @@ public class AnnotationUtils {
     					if(!path.startsWith(modelURI)) continue;
     					String suffix = URIStringUtils.unescape(path.substring(modelPos));
     					if(suffix.startsWith("/")) suffix = suffix.substring(1);
-    					result.put(lib, new Pair<String, ImageDescriptor>(suffix, descriptor));
+    					result.put(lib, Pair.make(suffix, descriptor));
 
     				}
 
@@ -532,48 +539,40 @@ public class AnnotationUtils {
 	 * @param selectionCallback
 	 */
 	public static void queryUserSelectedAnnotationType(
-			final Map<Resource, Pair<String, ImageDescriptor>> map,
-			final Consumer<Resource> selectionCallback)
+			Map<Resource, Pair<String, ImageDescriptor>> map,
+			Consumer<Resource> selectionCallback)
 	{
-		Display.getDefault().asyncExec(new Runnable() {
-			@Override
-			public void run() {
-				Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-				ResourceSelectionDialog3<Resource> dialog = new ResourceSelectionDialog3<Resource>(shell, map, "Select annotation type from list") {
-					@Override
-					protected IDialogSettings getBaseDialogSettings() {
-						return Activator.getDefault().getDialogSettings();
-					}
-				};
-				if (dialog.open() == Window.OK) {
-					Object[] result = dialog.getResult();
-					if (result != null && result.length == 1) {
-						final Resource res = (Resource)result[0];
-						selectionCallback.accept(res);
-					}
+		Display.getDefault().asyncExec(() -> {
+			Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+			ResourceSelectionDialog3<Resource> dialog = new ResourceSelectionDialog3<Resource>(shell, map, "Select annotation type from list") {
+				@Override
+				protected IDialogSettings getBaseDialogSettings() {
+					return Activator.getDefault().getDialogSettings();
+				}
+			};
+			if (dialog.open() == Window.OK) {
+				Object[] result = dialog.getResult();
+				if (result != null && result.length == 1) {
+					selectionCallback.accept((Resource) result[0]);
 				}
 			}
 		});
 	}
 
 	public static void queryLibrary(
-			final Map<Resource, Pair<String, ImageDescriptor>> map,
-			final Consumer<Pair<Resource,String>> selectionCallback)
+			Map<Resource, Pair<String, ImageDescriptor>> map,
+			Consumer<Pair<Resource,String>> selectionCallback)
 	{
-		Display.getDefault().asyncExec(new Runnable() {
-			@Override
-			public void run() {
-				Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-				SaveAnnotationDialog page = new SaveAnnotationDialog(shell, map, "Select library");
-				if (page.open() == Window.OK) {
-					Object[] result = page.getResult();
-					if (result != null && result.length == 1) {
-						final Resource res = (Resource)result[0];
-						selectionCallback.accept(Pair.make(res, page.getName()));
-					}
+		Display.getDefault().asyncExec(() -> {
+			Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+			SaveAnnotationDialog page = new SaveAnnotationDialog(shell, map, "Select library");
+			if (page.open() == Window.OK) {
+				Object[] result = page.getResult();
+				if (result != null && result.length == 1) {
+					selectionCallback.accept(Pair.make((Resource)result[0], page.getName()));
 				}
 			}
 		});
 	}
 	
-}
\ No newline at end of file
+}