From 6315ab643f0da71476c8eeaedf0a742ee0710f9d Mon Sep 17 00:00:00 2001 From: lehtonen Date: Tue, 17 Jun 2014 10:00:55 +0000 Subject: [PATCH] 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 --- .../sysdyn/ui/function/ModulesSearchFunction.java | 8 ++++---- .../org/simantics/sysdyn/ui/project/SysdynProject.java | 6 ------ 2 files changed, 4 insertions(+), 10 deletions(-) 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(typeResources.size()); rst.principalTypes = new ArrayList(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 requiredActivations = new HashSet(); - //requiredActivations.add(APROS.IndexActivation); - - } catch (DatabaseException e) { -- 2.47.1