From: lehtonen <lehtonen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Tue, 17 Jun 2014 10:00:55 +0000 (+0000)
Subject: Removed most references to Apros from Simantics codebase code and javadocs.
X-Git-Tag: 1.8.1~25
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=6315ab643f0da71476c8eeaedf0a742ee0710f9d;p=simantics%2Fsysdyn.git

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 bfed4278..2ef01ae3 100644
--- 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());
                 rst.principalTypes = new ArrayList<NamedResource>(principalTypeResources.size());
                 for (Resource t : typeResources) {
-                    String aprosName = graph.getPossibleRelatedValue(t, L0.HasName, Bindings.STRING);
-                    if (aprosName == null)
-                        aprosName = NameUtils.getSafeLabel(graph, t);
-                    NamedResource nr = NamedResource.of(graph, t, aprosName);
+                    String typeName = graph.getPossibleRelatedValue(t, L0.HasName, Bindings.STRING);
+                    if (typeName == null)
+                        typeName = NameUtils.getSafeLabel(graph, t);
+                    NamedResource nr = NamedResource.of(graph, t, typeName);
                     rst.types.add(nr);
                     if (principalTypeResources.contains(t))
                         rst.principalTypes.add(nr);
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 6756bb5e..96f4a89c 100644
--- 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");
             support.getWorkspacePersistent("preferences");
 			support.getWorkspacePersistent("issues");
-			
-            // Before activating, make sure that the necessary activations have been installed into the project.
-            //final Set<Resource> requiredActivations = new HashSet<Resource>();
-            //requiredActivations.add(APROS.IndexActivation);
-			
-        	
 
 		} catch (DatabaseException e) {