From c3945d04f5f0cff02b6d33d92d78325f53f121fa Mon Sep 17 00:00:00 2001
From: =?utf8?q?Hannu=20Niemist=C3=B6?= <hannu.niemisto@iki.fi>
Date: Mon, 24 Apr 2017 08:58:38 +0300
Subject: [PATCH] (refs #7105) Added defaultLocalName property to SCL modules

In textual modules defaultLocalName can be set in the module header. For
ontology modules, use Ontology.defaultLocalName property.

Change-Id: I2966c0b16e5d5f07c0e591a094f63908a7b492b3
---
 bundles/org.simantics.layer0/graph.tg         | Bin 55689 -> 55700 bytes
 .../graph/Layer0SCL.pgraph                    |   6 ++++--
 .../src/org/simantics/layer0/Layer0.java      |  12 ++++++------
 .../modeling/scl/OntologyModule.java          |  14 ++++++++++++++
 .../scl/compiler/compilation/Elaboration.java |   2 ++
 .../internal/header/ModuleHeader.java         |  10 ++++++++++
 .../scl/compiler/module/ConcreteModule.java   |  10 ++++++++++
 .../simantics/scl/compiler/module/Module.java |   1 +
 8 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/bundles/org.simantics.layer0/graph.tg b/bundles/org.simantics.layer0/graph.tg
index 053b27ddf0ce810a043ef0ef3a2a70e024891bc6..1d8b2756211657be5c47cbaa72849ed9a9ad63c1 100644
GIT binary patch
delta 586
zcmYk3%}*0i6vgLG(R3gdpFlBatPL?G6A}{w37uJhC<}oY!UE%>Xak-4Q6Pbqk1{QV
zilm50xVkYUER0Ku@h;f8_fMc3!+*fSRTtD#5i^sV+<SlL-1qV_CGmX_-?tmVFxfs$
z)9zfIN;vUMDm^kg8BaZmPbV}@55gf^RPYVSQR|pNHrIzkWQiF*XjW;M<5)dF(vN;#
z$~{kYwSacWgEKtT8&XT44?T2|v%OXI8uXrr7I`ar^rQ;}(t~hq^ew2TsI^OKb3ZiT
z@$0Jiz$X6rP3WhfX3Q4qh41H2R?_GP!8S$NwA&?SZ{JkwKn`^Ak~OJ3zUx;m(4Yse
zi1qAOoyr4sdT>t6#3mVIIP(lT=CTv{e~Zl(r=7n#-G+&kBz#-il6|BK7~4Fjtjf#h
zRb6F)u6XdWWMBOZaBRn*qKvvd#QX10IN}EC$v>A!#nUflXJo{U60fg(p#pcf5n4qs
zrc<5|^S3B>zNHuT<#KVH<oDV&qU>HNM9Xr!bY17ZjX7H4?;8<X{2P_V%~PU<S|WqQ
guFk_d0sisU#19^I?~`=C3z6h@8!nOcx%BbDAL9Uvg8%>k

delta 638
zcmZ9HO)O(!6o&6<bwa4*o6$-r)yRYqiJzp@Etw)DWL6S05%Cw=5>_Zxw?9giP!)%r
zu(F@zBrGhfCz;GnL?V${Sos<INz}Qta^p+heCK`6d%k<mF6q}v|FhUkon{40vR;zF
zVHla37@3hIomsUqofHn_fQ%-a6`W+Z9Ttc==HDerI^<9`*FL(j59x%T%We&x$6kk3
z1ekVd=mN$ZDKX2mRYPZRuj!;OE5(PY`l!rz{i}55v^VknsOh`7Zd3m>-OtPqru`@G
zkFg5yNcMi|Vfw_nWI33+SUe3)?>z77EH|o&DwdbKGTEI;i&$anVP*DSrt=>)*&@WK
zLxY248otgF5k}P-943Q14tVFO#eGj1{`Od?(%TFo%9$cfZi#&3DV<Ol88vv3Vw1n}
zF{0$aG7cYKp=-4d&w@t~MR%wImeR~kf5H}k2;N3YA^aBn8r_Ewwrp4-m|;}6@)1B$
zA^ndw0QM*I@L=--mH0FS@L#-wMq>>?-_{=i{4cZf>MXfdn*n_ZKg{7nq7i&=U-l+#
nfcJ@f><$>|^A<muSo}+C+qs5Z=LcRzJy4HjJ0*0wciH|7E83&Y

diff --git a/bundles/org.simantics.layer0/graph/Layer0SCL.pgraph b/bundles/org.simantics.layer0/graph/Layer0SCL.pgraph
index 88e081701..526139c0d 100644
--- a/bundles/org.simantics.layer0/graph/Layer0SCL.pgraph
+++ b/bundles/org.simantics.layer0/graph/Layer0SCL.pgraph
@@ -55,9 +55,11 @@ L0.Functions.clusterValidator : L0.Function
 
 L0.SCLModule <T L0.Entity
     >-- L0.SCLModule.definition --> L0.String <R L0.HasProperty : L0.TotalFunction
-    >-- L0.SCLModule.alias --> L0.String <R L0.HasProperty : L0.TotalFunction
     @L0.assert L0.SCLModule.definition ""
-    @L0.assert L0.SCLModule.alias ""
+
+L0.Ontology
+    >-- L0.Ontology.defaultLocalName --> L0.String <R L0.HasProperty : L0.TotalFunction
+    @L0.assert L0.Ontology.defaultLocalName ""
 
 L0.entityReplacer ==> "Resource -> Resource -> <WriteGraph> ()" <R L0.HasProperty : L0.FunctionalRelation
     L0.HasDescription """Used for defining an SCL function that knows how to copy the contents from one entity instance to another when both instances are known to be of the same type.
diff --git a/bundles/org.simantics.layer0/src/org/simantics/layer0/Layer0.java b/bundles/org.simantics.layer0/src/org/simantics/layer0/Layer0.java
index 5467995bb..8c2b4ae1c 100644
--- a/bundles/org.simantics.layer0/src/org/simantics/layer0/Layer0.java
+++ b/bundles/org.simantics.layer0/src/org/simantics/layer0/Layer0.java
@@ -202,6 +202,8 @@ public class Layer0 {
     public final Resource NamespaceMigrationStep_Prefix_to;
     public final Resource NamespaceMigrationStep_Prefix_to_Inverse;
     public final Resource Ontology;
+    public final Resource Ontology_defaultLocalName;
+    public final Resource Ontology_defaultLocalName_Inverse;
     public final Resource Ontology_download;
     public final Resource Ontology_download_Inverse;
     public final Resource Ontology_global;
@@ -232,8 +234,6 @@ public class Layer0 {
     public final Resource SCLMigrationStep;
     public final Resource SCLMigrationStep_SCLMigrationStepAction;
     public final Resource SCLModule;
-    public final Resource SCLModule_alias;
-    public final Resource SCLModule_alias_Inverse;
     public final Resource SCLModule_definition;
     public final Resource SCLModule_definition_Inverse;
     public final Resource SCLValue;
@@ -506,6 +506,8 @@ public class Layer0 {
         public static final String NamespaceMigrationStep_Prefix_to = "http://www.simantics.org/Layer0-1.1/NamespaceMigrationStep/Prefix/to";
         public static final String NamespaceMigrationStep_Prefix_to_Inverse = "http://www.simantics.org/Layer0-1.1/NamespaceMigrationStep/Prefix/to/Inverse";
         public static final String Ontology = "http://www.simantics.org/Layer0-1.1/Ontology";
+        public static final String Ontology_defaultLocalName = "http://www.simantics.org/Layer0-1.1/Ontology/defaultLocalName";
+        public static final String Ontology_defaultLocalName_Inverse = "http://www.simantics.org/Layer0-1.1/Ontology/defaultLocalName/Inverse";
         public static final String Ontology_download = "http://www.simantics.org/Layer0-1.1/Ontology/download";
         public static final String Ontology_download_Inverse = "http://www.simantics.org/Layer0-1.1/Ontology/download/Inverse";
         public static final String Ontology_global = "http://www.simantics.org/Layer0-1.1/Ontology/global";
@@ -536,8 +538,6 @@ public class Layer0 {
         public static final String SCLMigrationStep = "http://www.simantics.org/Layer0-1.1/SCLMigrationStep";
         public static final String SCLMigrationStep_SCLMigrationStepAction = "http://www.simantics.org/Layer0-1.1/SCLMigrationStep/SCLMigrationStepAction";
         public static final String SCLModule = "http://www.simantics.org/Layer0-1.1/SCLModule";
-        public static final String SCLModule_alias = "http://www.simantics.org/Layer0-1.1/SCLModule/alias";
-        public static final String SCLModule_alias_Inverse = "http://www.simantics.org/Layer0-1.1/SCLModule/alias/Inverse";
         public static final String SCLModule_definition = "http://www.simantics.org/Layer0-1.1/SCLModule/definition";
         public static final String SCLModule_definition_Inverse = "http://www.simantics.org/Layer0-1.1/SCLModule/definition/Inverse";
         public static final String SCLValue = "http://www.simantics.org/Layer0-1.1/SCLValue";
@@ -820,6 +820,8 @@ public class Layer0 {
         NamespaceMigrationStep_Prefix_to = getResourceOrNull(graph, URIs.NamespaceMigrationStep_Prefix_to);
         NamespaceMigrationStep_Prefix_to_Inverse = getResourceOrNull(graph, URIs.NamespaceMigrationStep_Prefix_to_Inverse);
         Ontology = getResourceOrNull(graph, URIs.Ontology);
+        Ontology_defaultLocalName = getResourceOrNull(graph, URIs.Ontology_defaultLocalName);
+        Ontology_defaultLocalName_Inverse = getResourceOrNull(graph, URIs.Ontology_defaultLocalName_Inverse);
         Ontology_download = getResourceOrNull(graph, URIs.Ontology_download);
         Ontology_download_Inverse = getResourceOrNull(graph, URIs.Ontology_download_Inverse);
         Ontology_global = getResourceOrNull(graph, URIs.Ontology_global);
@@ -850,8 +852,6 @@ public class Layer0 {
         SCLMigrationStep = getResourceOrNull(graph, URIs.SCLMigrationStep);
         SCLMigrationStep_SCLMigrationStepAction = getResourceOrNull(graph, URIs.SCLMigrationStep_SCLMigrationStepAction);
         SCLModule = getResourceOrNull(graph, URIs.SCLModule);
-        SCLModule_alias = getResourceOrNull(graph, URIs.SCLModule_alias);
-        SCLModule_alias_Inverse = getResourceOrNull(graph, URIs.SCLModule_alias_Inverse);
         SCLModule_definition = getResourceOrNull(graph, URIs.SCLModule_definition);
         SCLModule_definition_Inverse = getResourceOrNull(graph, URIs.SCLModule_definition_Inverse);
         SCLValue = getResourceOrNull(graph, URIs.SCLValue);
diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/scl/OntologyModule.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/scl/OntologyModule.java
index 1c8c91927..39cf2f765 100644
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/scl/OntologyModule.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/scl/OntologyModule.java
@@ -41,13 +41,27 @@ public class OntologyModule extends LazyModule {
     private static final TCon RESOURCE = Types.con(DB_MODULE, "Resource");
     
     Resource ontology;
+    String defaultLocalName;
     THashMap<Resource,Map<String,Resource>> childMaps = new THashMap<Resource,Map<String,Resource>>();
     
     public OntologyModule(ReadGraph graph, String moduleName) throws DatabaseException {
         super(moduleName);
         ontology = graph.getResource(moduleName);
+        readDefaultLocalName(graph);
         childMaps.put(ontology, createLocalMap(graph, ontology));
     }
+    
+    private void readDefaultLocalName(ReadGraph graph) throws DatabaseException {
+        Layer0 L0 = Layer0.getInstance(graph);
+        defaultLocalName = graph.getPossibleRelatedValue(ontology, L0.Ontology_defaultLocalName);
+        if(defaultLocalName == null)
+            defaultLocalName = "";
+    }
+
+	@Override
+    public String getDefaultLocalName() {
+    	return defaultLocalName;
+    }
 
     @Override
     public List<ImportDeclaration> getDependencies() {
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/Elaboration.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/Elaboration.java
index 898f6c0a5..c36564eda 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/Elaboration.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/Elaboration.java
@@ -159,6 +159,8 @@ public class Elaboration {
 
         module = new ConcreteModule(moduleName);
         compilationContext.module = module;
+        if(moduleHeader != null && moduleHeader.defaultLocalName != null)
+        	module.setDefaultLocalName(moduleHeader.defaultLocalName);
         try {
             if(timer != null)
                 timer.suspendTimer();
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/header/ModuleHeader.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/header/ModuleHeader.java
index 9ca588779..7fec8f83c 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/header/ModuleHeader.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/header/ModuleHeader.java
@@ -8,6 +8,7 @@ import org.simantics.scl.compiler.internal.parsing.declarations.DModuleHeader;
 public class ModuleHeader {
     public String classLoader;
     public long classLoaderLocation;
+    public String defaultLocalName;
     
     private void read(ErrorLog errorLog, DModuleHeader header) {
         for(FieldAssignment assignment : header.fields)
@@ -23,6 +24,15 @@ public class ModuleHeader {
                         classLoaderLocation = assignment.location;
                 }
                 break;
+            case "defaultLocalName":
+            	if(assignment.value == null)
+                    errorLog.log(assignment.location, "Property defaultLocalName needs to be given a string value.");
+            	else {
+            		defaultLocalName = AnnotationUtils.extractString(assignment.value);
+            		if(defaultLocalName == null)
+            			errorLog.log(assignment.value.location, "Expected string here.");
+            	}
+            	break;
             default:
                 errorLog.logWarning(assignment.location, "Unknown module header field was skipped.");
             }
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/ConcreteModule.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/ConcreteModule.java
index 697e64ef8..55ee202f7 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/ConcreteModule.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/ConcreteModule.java
@@ -31,6 +31,7 @@ import gnu.trove.procedure.TObjectProcedure;
 
 public class ConcreteModule implements Module {
     String moduleName;
+    String defaultLocalName;
     THashMap<String, TypeDescriptor> typeDescriptors = new THashMap<String, TypeDescriptor>();
     THashMap<String, EffectConstructor> effectConstructors = new THashMap<String, EffectConstructor>();
     THashMap<String, TypeClass> typeClasses = new THashMap<String, TypeClass>();
@@ -54,6 +55,15 @@ public class ConcreteModule implements Module {
         this.moduleName = moduleName;
     }
 
+    @Override
+    public String getDefaultLocalName() {
+    	return defaultLocalName;
+    }
+    
+    public void setDefaultLocalName(String defaultLocalName) {
+		this.defaultLocalName = defaultLocalName;
+	}
+    
     public boolean addTypeDescriptor(String name, TypeDescriptor typeConstructor) {
         return typeDescriptors.put(name, typeConstructor) != null;
     }
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/Module.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/Module.java
index 6f13ed426..aff2e2d7f 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/Module.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/Module.java
@@ -25,6 +25,7 @@ import gnu.trove.procedure.TObjectProcedure;
 
 public interface Module {
     String getName();
+    String getDefaultLocalName();
     
     SCLValue getValue(String name);
     SCLRelation getRelation(String name);
-- 
2.47.1