X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.document.linking.ui%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Flinking%2Freport%2Fevaluator%2FPredefinedVariables.java;h=c901784012796c805f247dee5c7710df75469dcc;hb=HEAD;hp=577f48e46dbb969cfa8395f357a1e23cf784718e;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.document.linking.ui/src/org/simantics/document/linking/report/evaluator/PredefinedVariables.java b/bundles/org.simantics.document.linking.ui/src/org/simantics/document/linking/report/evaluator/PredefinedVariables.java index 577f48e46..c90178401 100644 --- a/bundles/org.simantics.document.linking.ui/src/org/simantics/document/linking/report/evaluator/PredefinedVariables.java +++ b/bundles/org.simantics.document.linking.ui/src/org/simantics/document/linking/report/evaluator/PredefinedVariables.java @@ -2,6 +2,7 @@ package org.simantics.document.linking.report.evaluator; import java.util.Collection; +import org.simantics.Simantics; import org.simantics.annotation.ontology.AnnotationResource; import org.simantics.db.ReadGraph; import org.simantics.db.Resource; @@ -9,7 +10,6 @@ import org.simantics.db.exception.DatabaseException; import org.simantics.db.layer0.variable.Variable; import org.simantics.db.layer0.variable.Variables; import org.simantics.layer0.Layer0; -import org.simantics.ui.SimanticsUI; /** * Copy-paste from org.simantics.diagram.function.PredefinedVariables (removed diagram specific stuff) @@ -19,11 +19,11 @@ import org.simantics.ui.SimanticsUI; * */ public class PredefinedVariables { - public static final String root = "root"; - public static final String project = "project"; - public static final String model = "model"; - public static final String template = "template"; - public static final String current = "."; + public static final String root = "root"; //$NON-NLS-1$ + public static final String project = "project"; //$NON-NLS-1$ + public static final String model = "model"; //$NON-NLS-1$ + public static final String template = "template"; //$NON-NLS-1$ + public static final String current = "."; //$NON-NLS-1$ private static PredefinedVariables factory = new PredefinedVariables(); @@ -63,7 +63,7 @@ public class PredefinedVariables { if (id.equals(root)) predefined = graph.getRootLibrary(); else if (id.equals(project)) - predefined = SimanticsUI.getProject().get(); + predefined = Simantics.getProject().get(); else if (id.equals(model)) predefined = Variables.getModel(graph, selection); else if (id.equals(template)){ @@ -119,7 +119,7 @@ public class PredefinedVariables { if (colonInx != -1 && firstFlashInx != -1 && colonInx+1 == firstFlashInx && path.length() > firstFlashInx+1){ String scheme = path.substring(0, colonInx); String absPath = path.substring(firstFlashInx+1); - if (scheme.equals("pre")){ + if (scheme.equals("pre")){ //$NON-NLS-1$ int endOfPredefined1 = absPath.indexOf('/'); int endOfPredefined2 = absPath.indexOf('#'); if (endOfPredefined1 == -1 && endOfPredefined2 == -1) @@ -150,7 +150,7 @@ public class PredefinedVariables { Variable property = null; if (relativePath != null){ - if (relativePath.startsWith("/.")) + if (relativePath.startsWith("/.")) //$NON-NLS-1$ relativePath = relativePath.substring(1); property = v.browsePossible(graph, relativePath); }