Merge "Sort symbol item contributions alphanumerically, not lexicographically"

diff --git a/bundles/org.simantics.project/src/org/simantics/project/management/PlatformUtil.java b/bundles/org.simantics.project/src/org/simantics/project/management/PlatformUtil.java
index af59dbfc164bdd60a859011597bd334a7b406e49..8f93d24ab293d937467e78ca233a0056c5462abe 100644 (file)
--- a/bundles/org.simantics.project/src/org/simantics/project/management/PlatformUtil.java
+++ b/bundles/org.simantics.project/src/org/simantics/project/management/PlatformUtil.java
@@ -479,7 +479,18 @@ public class PlatformUtil {
 
        private static boolean isImmutable(Bundle bundle) {
                String immutable = (String) bundle.getHeaders().get("Immutable");
-               return immutable != null ? "true".equals(immutable) : true;
+               if(immutable == null)
+                       return true;
+               if("false".equals(immutable))
+                       return false;
+               if("trueWhenDeployed".equals(immutable)) {
+                       String installHint = System.getProperty("installOntologiesAsDeployed");
+                       if("true".equals(installHint))
+                               return true;
+                       else
+                               return false;
+               }
+               return true;
        }
 
        public static class TGInfo {