From 31664b68100388a43ce2d3c36c98ed2910c9b6a9 Mon Sep 17 00:00:00 2001
From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Thu, 10 Nov 2016 00:22:14 +0200
Subject: [PATCH] Sync git svn branch with SVN repository r33382.

refs #6803
[PRIVATE-12714]
---
 .../graph.tg                                  | Bin 16091 -> 16745 bytes
 .../graph/Annotation.pgraph                   |   4 +
 .../ontology/AnnotationResource.java          |   6 ++
 .../annotation/ui/AnnotationUtils.java        | 101 +++++++++---------
 4 files changed, 60 insertions(+), 51 deletions(-)

diff --git a/bundles/org.simantics.annotation.ontology/graph.tg b/bundles/org.simantics.annotation.ontology/graph.tg
index 2a28024a302837e5e154a0d77475359f2025c8d5..2898f00845cb681e793447b895084b4d4774174d 100644
GIT binary patch
literal 16745
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

literal 16091
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
F{{t$<nT7xW

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
+}
-- 
2.47.1