Removed most references to Apros from Simantics codebase code and javadocs.

refs #4954

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@29627 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/function/ModulesSearchFunction.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/function/ModulesSearchFunction.java
index bfed4278f9d367f7ec70cf1a815dcef0af44920b..2ef01ae32cb02fb4239471eeb000f885f1763feb 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/function/ModulesSearchFunction.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/function/ModulesSearchFunction.java
@@ -140,10 +140,10 @@ public class ModulesSearchFunction extends FunctionImpl5<IProgressMonitor, ReadG
                 rst.types = new ArrayList<NamedResource>(typeResources.size());\r
                 rst.principalTypes = new ArrayList<NamedResource>(principalTypeResources.size());\r
                 for (Resource t : typeResources) {\r
-                    String aprosName = graph.getPossibleRelatedValue(t, L0.HasName, Bindings.STRING);\r
-                    if (aprosName == null)\r
-                        aprosName = NameUtils.getSafeLabel(graph, t);\r
-                    NamedResource nr = NamedResource.of(graph, t, aprosName);\r
+                    String typeName = graph.getPossibleRelatedValue(t, L0.HasName, Bindings.STRING);\r
+                    if (typeName == null)\r
+                        typeName = NameUtils.getSafeLabel(graph, t);\r
+                    NamedResource nr = NamedResource.of(graph, t, typeName);\r
                     rst.types.add(nr);\r
                     if (principalTypeResources.contains(t))\r
                         rst.principalTypes.add(nr);\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/SysdynProject.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/SysdynProject.java
index 6756bb5ef99da7753b0ac1a32ddacce0347934db..96f4a89ca96b31665f500f5f0c0c9ef6fa843802 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/SysdynProject.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/SysdynProject.java
@@ -129,12 +129,6 @@ public class SysdynProject extends AbstractProjectFeature {
                        support.getWorkspacePersistent("profiles");\r
             support.getWorkspacePersistent("preferences");\r
                        support.getWorkspacePersistent("issues");\r
-                       \r
-            // Before activating, make sure that the necessary activations have been installed into the project.\r
-            //final Set<Resource> requiredActivations = new HashSet<Resource>();\r
-            //requiredActivations.add(APROS.IndexActivation);\r
-                       \r
-               \r
 \r
                } catch (DatabaseException e) {\r
 \r