Removed org.simantics.ltk[.antlr] bundles, exact import for antlr

gitlab #24

Change-Id: I582628d505edcec5565e768a42b984fdb3e096fb

diff --git a/bundles/org.simantics.graph.compiler/META-INF/MANIFEST.MF b/bundles/org.simantics.graph.compiler/META-INF/MANIFEST.MF
index 9e5345c874fdd65ae9c3cb725df0005406900631..f1e93de0d2f096cd922b9afef5f7824ed40f180c 100644 (file)
--- a/bundles/org.simantics.graph.compiler/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.graph.compiler/META-INF/MANIFEST.MF
@@ -4,13 +4,13 @@ Bundle-Name: Compiler
 Bundle-SymbolicName: org.simantics.graph.compiler;singleton:=true
 Bundle-Version: 1.1.16.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.simantics.graph;bundle-version="1.0.0";visibility:=reexport,
- org.simantics.ltk.antlr;bundle-version="1.1.12",
- org.simantics.databoard;bundle-version="0.5.3",
- freemarker;bundle-version="2.3.16",
+Require-Bundle: org.simantics.graph;bundle-version="1.1.15";visibility:=reexport,
+ org.simantics.databoard;bundle-version="0.6.6",
+ freemarker;bundle-version="2.3.23",
  org.junit;bundle-version="4.12.0";resolution:=optional
-Export-Package: org.simantics.graph.compiler
-Import-Package: org.antlr.runtime;bundle-version="[3.5.2,4.0.0)",
- org.antlr.runtime.debug;bundle-version="[3.5.2,4.0.0)",
- org.antlr.runtime.misc;bundle-version="[3.5.2,4.0.0)",
- org.antlr.runtime.tree;bundle-version="[3.5.2,4.0.0)"
+Export-Package: org.simantics.graph.compiler,
+ org.simantics.graph.compiler.internal.ltk
+Import-Package: org.antlr.runtime;version="[0.0.0,0.0.0]";bundle-version="3.5.2",
+ org.antlr.runtime.debug;version="[0.0.0,0.0.0]";bundle-version="3.5.2",
+ org.antlr.runtime.misc;version="[0.0.0,0.0.0]";bundle-version="3.5.2",
+ org.antlr.runtime.tree;version="[0.0.0,0.0.0]";bundle-version="3.5.2"

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/CompilationResult.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/CompilationResult.java
index c7d63f41e25ec268bd45b61c7f6afcaa2d295479..8e68b965cecba55c6f1d64213bcc1d7ec8d6cb06 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/CompilationResult.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/CompilationResult.java
@@ -3,12 +3,12 @@ package org.simantics.graph.compiler;
 import java.util.Collection;
 
 import org.simantics.graph.IResourceFile;
+import org.simantics.graph.compiler.internal.ltk.Problem;
 import org.simantics.graph.representation.TransferableGraph1;
-import org.simantics.ltk.Problem;
 
 /**
  * Result of invoking GraphCompiler.compile.
- * @author Hannu Niemistö
+ * @author Hannu Niemist�
  */
 public class CompilationResult {
        TransferableGraph1 graph;

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/GraphCompiler.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/GraphCompiler.java
index c1d9609e712b056a2313faebdde51b92a37cb9d6..ed5578992b69123ace2106ec0e52a66ce7df1c22 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/GraphCompiler.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/GraphCompiler.java
@@ -21,6 +21,10 @@ import org.simantics.databoard.binding.error.BindingException;
 import org.simantics.databoard.binding.mutable.Variant;
 import org.simantics.databoard.container.DataContainer;
 import org.simantics.databoard.container.DataContainers;
+import org.simantics.graph.compiler.internal.ltk.FileSource;
+import org.simantics.graph.compiler.internal.ltk.ISource;
+import org.simantics.graph.compiler.internal.ltk.Location;
+import org.simantics.graph.compiler.internal.ltk.Problem;
 import org.simantics.graph.compiler.internal.parsing.Parsing;
 import org.simantics.graph.compiler.internal.procedures.AddConsistsOf;
 import org.simantics.graph.compiler.internal.procedures.ApplyTemplates;
@@ -42,10 +46,6 @@ import org.simantics.graph.query.TransferableGraphConversion;
 import org.simantics.graph.representation.Extensions;
 import org.simantics.graph.representation.TransferableGraph1;
 import org.simantics.graph.store.GraphStore;
-import org.simantics.ltk.FileSource;
-import org.simantics.ltk.ISource;
-import org.simantics.ltk.Location;
-import org.simantics.ltk.Problem;
 
 public class GraphCompiler {
        

diff --git a/bundles/org.simantics.ltk/src/org/simantics/ltk/FileSource.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/FileSource.java
similarity index 92%
rename from bundles/org.simantics.ltk/src/org/simantics/ltk/FileSource.java
rename to bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/FileSource.java
index 88addd43fadcf631146b09e7576b26bb5b31d4cc..14640fae3b059e22ad08313550f55539cce7ac6d 100644 (file)
--- a/bundles/org.simantics.ltk/src/org/simantics/ltk/FileSource.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/FileSource.java
@@ -1,4 +1,4 @@
-package org.simantics.ltk;
+package org.simantics.graph.compiler.internal.ltk;
 
 import java.io.File;
 import java.io.FileInputStream;

diff --git a/bundles/org.simantics.ltk/src/org/simantics/ltk/ISource.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/ISource.java
similarity index 80%
rename from bundles/org.simantics.ltk/src/org/simantics/ltk/ISource.java
rename to bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/ISource.java
index af5c3654d26a1145c0accccd43babf00fe14805c..3c089144dcca58457c37428ddb583183d51156ac 100644 (file)
--- a/bundles/org.simantics.ltk/src/org/simantics/ltk/ISource.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/ISource.java
@@ -1,4 +1,4 @@
-package org.simantics.ltk;
+package org.simantics.graph.compiler.internal.ltk;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/bundles/org.simantics.ltk/src/org/simantics/ltk/LocalResourceSource.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/LocalResourceSource.java
similarity index 93%
rename from bundles/org.simantics.ltk/src/org/simantics/ltk/LocalResourceSource.java
rename to bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/LocalResourceSource.java
index 08293e97914b96e9a21f04160be2049c428d223e..34cda236491acf0d31306362b5cf42878487cdc3 100644 (file)
--- a/bundles/org.simantics.ltk/src/org/simantics/ltk/LocalResourceSource.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/LocalResourceSource.java
@@ -1,4 +1,4 @@
-package org.simantics.ltk;
+package org.simantics.graph.compiler.internal.ltk;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/bundles/org.simantics.ltk/src/org/simantics/ltk/Location.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/Location.java
similarity index 93%
rename from bundles/org.simantics.ltk/src/org/simantics/ltk/Location.java
rename to bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/Location.java
index 011fdc3b235ec1a0e4fef112850da3d43019e02b..4bdb81430f97c5cb0fc337380ad113b666db6b2c 100644 (file)
--- a/bundles/org.simantics.ltk/src/org/simantics/ltk/Location.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/Location.java
@@ -1,4 +1,4 @@
-package org.simantics.ltk;
+package org.simantics.graph.compiler.internal.ltk;
 
 
 public class Location {

diff --git a/bundles/org.simantics.ltk/src/org/simantics/ltk/Problem.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/Problem.java
similarity index 92%
rename from bundles/org.simantics.ltk/src/org/simantics/ltk/Problem.java
rename to bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/Problem.java
index 8f31723b7fd1e077c2da729b8b0060c67925cf68..96347895ac910bff2e59440b85470cc6c53866c2 100644 (file)
--- a/bundles/org.simantics.ltk/src/org/simantics/ltk/Problem.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/Problem.java
@@ -1,4 +1,4 @@
-package org.simantics.ltk;
+package org.simantics.graph.compiler.internal.ltk;
 
 public class Problem {
        Location location;

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/Severity.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/Severity.java
new file mode 100644 (file)
index 0000000..afe0771
--- /dev/null
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/Severity.java
@@ -0,0 +1,5 @@
+package org.simantics.graph.compiler.internal.ltk;
+
+public enum Severity {
+       WARNING, ERROR
+}

diff --git a/bundles/org.simantics.ltk/src/org/simantics/ltk/SourcePart.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/SourcePart.java
similarity index 94%
rename from bundles/org.simantics.ltk/src/org/simantics/ltk/SourcePart.java
rename to bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/SourcePart.java
index 1559df7c804224b7993d3534910f8100204b552d..35a8b1666cf4cff0fc06d5c4ab35bf5f541f6c6f 100644 (file)
--- a/bundles/org.simantics.ltk/src/org/simantics/ltk/SourcePart.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/SourcePart.java
@@ -1,4 +1,4 @@
-package org.simantics.ltk;
+package org.simantics.graph.compiler.internal.ltk;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/bundles/org.simantics.ltk.antlr/src/org/simantics/ltk/antlr/ANTLRUtils.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/antlr/ANTLRUtils.java
similarity index 92%
rename from bundles/org.simantics.ltk.antlr/src/org/simantics/ltk/antlr/ANTLRUtils.java
rename to bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/antlr/ANTLRUtils.java
index ec26244c057e0587096e2da2408308c8d97f9d2d..7793473be1cf92a90754eeff39e81fe7d7114694 100644 (file)
--- a/bundles/org.simantics.ltk.antlr/src/org/simantics/ltk/antlr/ANTLRUtils.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/ltk/antlr/ANTLRUtils.java
@@ -1,4 +1,4 @@
-package org.simantics.ltk.antlr;
+package org.simantics.graph.compiler.internal.ltk.antlr;
 
 import java.io.IOException;
 
@@ -12,9 +12,9 @@ import org.antlr.runtime.RecognitionException;
 import org.antlr.runtime.Token;
 import org.antlr.runtime.tree.CommonTree;
 import org.antlr.runtime.tree.Tree;
-import org.simantics.ltk.ISource;
-import org.simantics.ltk.Location;
-import org.simantics.ltk.Problem;
+import org.simantics.graph.compiler.internal.ltk.ISource;
+import org.simantics.graph.compiler.internal.ltk.Location;
+import org.simantics.graph.compiler.internal.ltk.Problem;
 
 public class ANTLRUtils {
 

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/parsing/Parsing.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/parsing/Parsing.java
index 7c49b93155e40f3a2cd839a4e465eadacaa6f604..8369180a341879500bb5007f3a631fabd277c980 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/parsing/Parsing.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/parsing/Parsing.java
@@ -1,9 +1,5 @@
 package org.simantics.graph.compiler.internal.parsing;
 
-import gnu.trove.map.hash.THashMap;
-import gnu.trove.procedure.TObjectIntProcedure;
-import gnu.trove.procedure.TObjectObjectProcedure;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -24,6 +20,11 @@ import org.antlr.runtime.TokenStream;
 import org.antlr.runtime.tree.Tree;
 import org.simantics.graph.compiler.SourceInfo.SourceFile;
 import org.simantics.graph.compiler.SourceInfo.Variable;
+import org.simantics.graph.compiler.internal.ltk.ISource;
+import org.simantics.graph.compiler.internal.ltk.Location;
+import org.simantics.graph.compiler.internal.ltk.Problem;
+import org.simantics.graph.compiler.internal.ltk.SourcePart;
+import org.simantics.graph.compiler.internal.ltk.antlr.ANTLRUtils;
 import org.simantics.graph.compiler.internal.parsing.GraphParser.file_return;
 import org.simantics.graph.compiler.internal.parsing.SourceSplitter.SplitPoint;
 import org.simantics.graph.compiler.internal.store.VariableStore;
@@ -31,11 +32,10 @@ import org.simantics.graph.compiler.internal.translation.GraphTranslator;
 import org.simantics.graph.query.Paths;
 import org.simantics.graph.store.GraphStore;
 import org.simantics.graph.utils.GraphExecutor;
-import org.simantics.ltk.ISource;
-import org.simantics.ltk.Location;
-import org.simantics.ltk.Problem;
-import org.simantics.ltk.SourcePart;
-import org.simantics.ltk.antlr.ANTLRUtils;
+
+import gnu.trove.map.hash.THashMap;
+import gnu.trove.procedure.TObjectIntProcedure;
+import gnu.trove.procedure.TObjectObjectProcedure;
 
 public class Parsing implements Runnable {
 

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/AddConsistsOf.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/AddConsistsOf.java
index 0c3d186dbf93e3d7b122a9388bd1861dfdb1e93f..753d4bdd2a47ca48ea3ae429bbcac64938031a40 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/AddConsistsOf.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/AddConsistsOf.java
@@ -1,13 +1,13 @@
 package org.simantics.graph.compiler.internal.procedures;
 
-import gnu.trove.procedure.TObjectProcedure;
-
 import org.simantics.graph.query.Paths;
 import org.simantics.graph.store.GraphStore;
 import org.simantics.graph.store.IdentityStore;
 import org.simantics.graph.store.IdentityStore.ConsistsOf;
 import org.simantics.graph.store.StatementStore;
 
+import gnu.trove.procedure.TObjectProcedure;
+
 public class AddConsistsOf implements Runnable {
 
        GraphStore store;

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/ApplyTemplates.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/ApplyTemplates.java
index 48ff1e111b33df5d60f78b86e11f6073cdec816c..1c22cb7b7a00012d77a5f9a9cb167a4443c9c7f2 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/ApplyTemplates.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/ApplyTemplates.java
@@ -1,12 +1,12 @@
 package org.simantics.graph.compiler.internal.procedures;
 
-import gnu.trove.map.hash.TIntObjectHashMap;
-
 import java.util.Arrays;
 import java.util.Collection;
 
 import org.simantics.databoard.Bindings;
 import org.simantics.graph.compiler.ExternalFileLoader;
+import org.simantics.graph.compiler.internal.ltk.Location;
+import org.simantics.graph.compiler.internal.ltk.Problem;
 import org.simantics.graph.compiler.internal.store.LocationStore;
 import org.simantics.graph.compiler.internal.templates.BuiltinTemplates;
 import org.simantics.graph.compiler.internal.templates.GraphTemplate;
@@ -18,8 +18,8 @@ import org.simantics.graph.query.Paths;
 import org.simantics.graph.query.Res;
 import org.simantics.graph.representation.TransferableGraph1;
 import org.simantics.graph.store.GraphStore;
-import org.simantics.ltk.Location;
-import org.simantics.ltk.Problem;
+
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 public class ApplyTemplates implements Runnable {
        IGraph graph;

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/Compactify.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/Compactify.java
index 7b647806d87947ee25ee01a01152a90da44d18f2..4c6babcb5bc8447fd63dad56f6f3fb286cd537f6 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/Compactify.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/Compactify.java
@@ -1,9 +1,9 @@
 package org.simantics.graph.compiler.internal.procedures;
 
-import gnu.trove.map.hash.TIntIntHashMap;
-
 import org.simantics.graph.store.GraphStore;
 
+import gnu.trove.map.hash.TIntIntHashMap;
+
 public class Compactify implements Runnable {
        GraphStore store;
 

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/ConvertPreValues.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/ConvertPreValues.java
index e7b80409af589f75d5a577d05f096151b61960a3..bb1fba2d9348544374b0d9fd2a21051f5f2ac247 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/ConvertPreValues.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/ConvertPreValues.java
@@ -1,13 +1,11 @@
 package org.simantics.graph.compiler.internal.procedures;
 
-import gnu.trove.list.array.TIntArrayList;
-import gnu.trove.map.hash.TIntObjectHashMap;
-
 import java.util.Collection;
 
 import org.simantics.databoard.Bindings;
 import org.simantics.databoard.binding.Binding;
 import org.simantics.databoard.type.Datatype;
+import org.simantics.graph.compiler.internal.ltk.Problem;
 import org.simantics.graph.compiler.internal.store.PreValueStore;
 import org.simantics.graph.query.IDataTypeQuery;
 import org.simantics.graph.query.IGraph;
@@ -15,7 +13,9 @@ import org.simantics.graph.query.Paths;
 import org.simantics.graph.store.GraphStore;
 import org.simantics.graph.store.StatementStore;
 import org.simantics.graph.store.ValueStore;
-import org.simantics.ltk.Problem;
+
+import gnu.trove.list.array.TIntArrayList;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 public class ConvertPreValues implements Runnable {
 

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/CreateInverseRelations.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/CreateInverseRelations.java
index 21ccc1464de7ee82a154536c58b219d24af302ad..e40844f80c8785949c615db5747b99995eb923dd 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/CreateInverseRelations.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/CreateInverseRelations.java
@@ -1,14 +1,14 @@
 package org.simantics.graph.compiler.internal.procedures;
 
-import gnu.trove.list.array.TIntArrayList;
-import gnu.trove.map.hash.TIntIntHashMap;
-
 import org.simantics.graph.query.IGraph;
 import org.simantics.graph.query.Paths;
 import org.simantics.graph.query.Res;
 import org.simantics.graph.store.GraphStore;
 import org.simantics.graph.store.StatementStore;
 
+import gnu.trove.list.array.TIntArrayList;
+import gnu.trove.map.hash.TIntIntHashMap;
+
 public class CreateInverseRelations implements Runnable {
        IGraph graph;
        GraphStore store;

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/CreateTemplates.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/CreateTemplates.java
index 3b3e217016a9855c7f7abdc4f0ee7d0db89367c4..5ca67016ef36bc423db6eae20a5fe8d6cc07a87f 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/CreateTemplates.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/CreateTemplates.java
@@ -1,12 +1,11 @@
 package org.simantics.graph.compiler.internal.procedures;
 
-import gnu.trove.procedure.TIntObjectProcedure;
-import gnu.trove.set.hash.THashSet;
-
 import java.util.Collection;
 
 import org.simantics.databoard.Bindings;
 import org.simantics.databoard.binding.mutable.Variant;
+import org.simantics.graph.compiler.internal.ltk.Location;
+import org.simantics.graph.compiler.internal.ltk.Problem;
 import org.simantics.graph.compiler.internal.store.LocationStore;
 import org.simantics.graph.compiler.internal.templates.TemplateDefinition;
 import org.simantics.graph.compiler.internal.templates.TemplateDefinitionStore;
@@ -14,8 +13,9 @@ import org.simantics.graph.query.CompositeGraph;
 import org.simantics.graph.query.Paths;
 import org.simantics.graph.representation.TransferableGraph1;
 import org.simantics.graph.store.GraphStore;
-import org.simantics.ltk.Location;
-import org.simantics.ltk.Problem;
+
+import gnu.trove.procedure.TIntObjectProcedure;
+import gnu.trove.set.hash.THashSet;
 
 public class CreateTemplates implements Runnable {
        

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/DefaultValueTyping.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/DefaultValueTyping.java
index 98ae7b943a6e1bdbc588c124e9070e6db8d1762f..288faf010217354900a597cfaafbc87073b6d5d1 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/DefaultValueTyping.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/DefaultValueTyping.java
@@ -1,14 +1,14 @@
 package org.simantics.graph.compiler.internal.procedures;
 
-import gnu.trove.procedure.TIntObjectProcedure;
-import gnu.trove.set.hash.TIntHashSet;
-
 import org.simantics.graph.compiler.internal.store.IPreValue;
 import org.simantics.graph.compiler.internal.store.PreValueStore;
 import org.simantics.graph.query.Path;
 import org.simantics.graph.query.Paths;
 import org.simantics.graph.store.GraphStore;
 
+import gnu.trove.procedure.TIntObjectProcedure;
+import gnu.trove.set.hash.TIntHashSet;
+
 public class DefaultValueTyping implements Runnable {
 
        GraphStore store;

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/MergeEqualResources.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/MergeEqualResources.java
index 61658b1a855d1213f10347c865d350e1e79ff5dc..8346f998d96263ff2ab511c4073b9d944719bedf 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/MergeEqualResources.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/procedures/MergeEqualResources.java
@@ -1,12 +1,12 @@
 package org.simantics.graph.compiler.internal.procedures;
 
-import gnu.trove.list.array.TIntArrayList;
-import gnu.trove.map.hash.TIntIntHashMap;
-
 import org.simantics.graph.query.Paths;
 import org.simantics.graph.store.GraphStore;
 import org.simantics.graph.store.IdentityStore;
 
+import gnu.trove.list.array.TIntArrayList;
+import gnu.trove.map.hash.TIntIntHashMap;
+
 public class MergeEqualResources implements Runnable {
 
        GraphStore store;

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/store/IPreValue.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/store/IPreValue.java
index 893d08cafecf86545705c0743b214d78562352a5..6c24f2792e7ab4a458b4ef9cc4c8c32a83b848f3 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/store/IPreValue.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/store/IPreValue.java
@@ -3,10 +3,10 @@ package org.simantics.graph.compiler.internal.store;
 import java.util.Collection;
 
 import org.simantics.databoard.binding.Binding;
+import org.simantics.graph.compiler.internal.ltk.Location;
+import org.simantics.graph.compiler.internal.ltk.Problem;
 import org.simantics.graph.query.Path;
 import org.simantics.graph.query.Paths;
-import org.simantics.ltk.Location;
-import org.simantics.ltk.Problem;
 
 
 

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/store/LocationStore.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/store/LocationStore.java
index 3c3799bf7561f536f030873ffef1237a4ab91c3a..06cb7f28a0052cf503564dc7982ca073c957264b 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/store/LocationStore.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/store/LocationStore.java
@@ -1,13 +1,13 @@
 package org.simantics.graph.compiler.internal.store;
 
+import org.simantics.graph.compiler.internal.ltk.Location;
+import org.simantics.graph.store.IStore;
+import org.simantics.graph.store.IndexMappingUtils;
+
 import gnu.trove.map.hash.TIntIntHashMap;
 import gnu.trove.map.hash.TIntObjectHashMap;
 import gnu.trove.set.hash.TIntHashSet;
 
-import org.simantics.graph.store.IStore;
-import org.simantics.graph.store.IndexMappingUtils;
-import org.simantics.ltk.Location;
-
 public class LocationStore implements IStore {
        
        TIntObjectHashMap<Location> locations;

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/store/PreValueStore.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/store/PreValueStore.java
index 8691588138e5dce4a258844a42ad03aae70fc937..dc4db34c56687b18d4644e7109053e780df152f7 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/store/PreValueStore.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/store/PreValueStore.java
@@ -1,22 +1,22 @@
 package org.simantics.graph.compiler.internal.store;
 
-import gnu.trove.map.hash.TIntIntHashMap;
-import gnu.trove.map.hash.TIntObjectHashMap;
-import gnu.trove.procedure.TIntObjectProcedure;
-import gnu.trove.set.hash.TIntHashSet;
-
 import java.util.ArrayList;
 import java.util.Collection;
 
 import org.simantics.databoard.Bindings;
 import org.simantics.databoard.binding.Binding;
 import org.simantics.databoard.binding.mutable.Variant;
+import org.simantics.graph.compiler.internal.ltk.Problem;
 import org.simantics.graph.compiler.internal.values.TreeValue;
 import org.simantics.graph.query.IDataTypeQuery;
 import org.simantics.graph.store.IStore;
 import org.simantics.graph.store.IndexMappingUtils;
 import org.simantics.graph.store.ValueStore;
-import org.simantics.ltk.Problem;
+
+import gnu.trove.map.hash.TIntIntHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
+import gnu.trove.procedure.TIntObjectProcedure;
+import gnu.trove.set.hash.TIntHashSet;
 
 public class PreValueStore implements IStore {
 

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/store/VariableStore.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/store/VariableStore.java
index 7accba99302724492bc802ea193eb1dc143f0822..f3dde927dad8c8792f0c388c6cb969a46b61f5a5 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/store/VariableStore.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/store/VariableStore.java
@@ -1,7 +1,5 @@
 package org.simantics.graph.compiler.internal.store;
 
-import gnu.trove.map.hash.TIntIntHashMap;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -11,6 +9,8 @@ import org.simantics.graph.compiler.SourceInfo.SourceFile;
 import org.simantics.graph.compiler.SourceInfo.Variable;
 import org.simantics.graph.store.IStore;
 
+import gnu.trove.map.hash.TIntIntHashMap;
+
 public class VariableStore implements IStore {
        
        public List<SourceFile> sourceFiles = new ArrayList<SourceFile>();

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/BuiltinTemplates.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/BuiltinTemplates.java
index 02ca1a6cb4f603a4708db7a7e1d80144adf732bb..ebe6721a2cc2ae23c651206ef362f807c85422de 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/BuiltinTemplates.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/BuiltinTemplates.java
@@ -1,11 +1,11 @@
 package org.simantics.graph.compiler.internal.templates;
 
-import gnu.trove.map.hash.THashMap;
-
 import org.simantics.graph.query.Path;
 import org.simantics.graph.query.PathChild;
 import org.simantics.graph.query.Paths;
 
+import gnu.trove.map.hash.THashMap;
+
 
 public class BuiltinTemplates {        
        public final THashMap<Path, ITemplate> TEMPLATES = 

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/GraphTemplate.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/GraphTemplate.java
index 0b3b921795029aa2e174969407c1d69d91bc9c46..3576dab377cf0a2a68b08bf557ff2f94df5bbc7e 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/GraphTemplate.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/GraphTemplate.java
@@ -1,12 +1,11 @@
 package org.simantics.graph.compiler.internal.templates;
 
-import gnu.trove.map.hash.TIntIntHashMap;
-import gnu.trove.map.hash.TObjectIntHashMap;
-
 import java.util.Arrays;
 import java.util.Collection;
 
 import org.simantics.graph.compiler.ExternalFileLoader;
+import org.simantics.graph.compiler.internal.ltk.Location;
+import org.simantics.graph.compiler.internal.ltk.Problem;
 import org.simantics.graph.compiler.internal.store.LocationStore;
 import org.simantics.graph.query.IGraph;
 import org.simantics.graph.representation.External;
@@ -18,8 +17,9 @@ import org.simantics.graph.store.GraphStore;
 import org.simantics.graph.store.IdentityStore;
 import org.simantics.graph.store.StatementStore;
 import org.simantics.graph.store.ValueStore;
-import org.simantics.ltk.Location;
-import org.simantics.ltk.Problem;
+
+import gnu.trove.map.hash.TIntIntHashMap;
+import gnu.trove.map.hash.TObjectIntHashMap;
 
 public class GraphTemplate implements ITemplate {
        int[] prototypeResources;

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/ITemplate.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/ITemplate.java
index d53b2829593bab5f14cfc756ae942541dee910b4..a69b23de3f8a5080670b5cc7a647bd7d02bf1cf5 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/ITemplate.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/ITemplate.java
@@ -3,9 +3,9 @@ package org.simantics.graph.compiler.internal.templates;
 import java.util.Collection;
 
 import org.simantics.graph.compiler.ExternalFileLoader;
+import org.simantics.graph.compiler.internal.ltk.Problem;
 import org.simantics.graph.query.IGraph;
 import org.simantics.graph.store.GraphStore;
-import org.simantics.ltk.Problem;
 
 public interface ITemplate {
        void apply(IGraph graph, GraphStore store, int[] parameters, ExternalFileLoader fileLoader, Collection<Problem> problems);

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/ListTemplate.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/ListTemplate.java
index f9855ce712d87741a4dfa5066f9b8ebcceca126b..1a8390befdeb1ae444352b5b80e6f6764abc25f7 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/ListTemplate.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/ListTemplate.java
@@ -3,10 +3,10 @@ package org.simantics.graph.compiler.internal.templates;
 import java.util.Collection;
 
 import org.simantics.graph.compiler.ExternalFileLoader;
+import org.simantics.graph.compiler.internal.ltk.Problem;
 import org.simantics.graph.query.IGraph;
 import org.simantics.graph.query.Paths;
 import org.simantics.graph.store.GraphStore;
-import org.simantics.ltk.Problem;
 
 public enum ListTemplate implements ITemplate {
        

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/LoadBytesTemplate.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/LoadBytesTemplate.java
index 1bfbe8f7413f5b981fc56a46b683482d7ceaa6aa..158931dea87b58c1ef626d7cc34630a48a06097a 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/LoadBytesTemplate.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/LoadBytesTemplate.java
@@ -6,12 +6,12 @@ import java.util.Collection;
 import org.simantics.databoard.Bindings;
 import org.simantics.databoard.binding.mutable.Variant;
 import org.simantics.graph.compiler.ExternalFileLoader;
+import org.simantics.graph.compiler.internal.ltk.Location;
+import org.simantics.graph.compiler.internal.ltk.Problem;
 import org.simantics.graph.compiler.internal.store.LocationStore;
 import org.simantics.graph.compiler.internal.store.PreValueStore;
 import org.simantics.graph.query.IGraph;
 import org.simantics.graph.store.GraphStore;
-import org.simantics.ltk.Location;
-import org.simantics.ltk.Problem;
 
 public enum LoadBytesTemplate implements ITemplate {
        INSTANCE;

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/LoadDataValueTemplate.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/LoadDataValueTemplate.java
index 94afd0b95397c2d355b773329c51f273f0a4f209..e461ab1746d2c0b8372d4b4e2356a6260f63b8b1 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/LoadDataValueTemplate.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/LoadDataValueTemplate.java
@@ -7,12 +7,12 @@ import org.simantics.databoard.Bindings;
 import org.simantics.databoard.binding.mutable.Variant;
 import org.simantics.databoard.serialization.Serializer;
 import org.simantics.graph.compiler.ExternalFileLoader;
+import org.simantics.graph.compiler.internal.ltk.Location;
+import org.simantics.graph.compiler.internal.ltk.Problem;
 import org.simantics.graph.compiler.internal.store.LocationStore;
 import org.simantics.graph.compiler.internal.store.PreValueStore;
 import org.simantics.graph.query.IGraph;
 import org.simantics.graph.store.GraphStore;
-import org.simantics.ltk.Location;
-import org.simantics.ltk.Problem;
 
 public enum LoadDataValueTemplate implements ITemplate {
        INSTANCE;

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/LoadStringTemplate.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/LoadStringTemplate.java
index 7bbd03369f2ae80f3595d955a90f8f6041347ab8..929ad86f7d29957d161c6f8b65594f2fb58ea810 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/LoadStringTemplate.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/LoadStringTemplate.java
@@ -6,12 +6,12 @@ import java.util.Collection;
 import org.simantics.databoard.Bindings;
 import org.simantics.databoard.binding.mutable.Variant;
 import org.simantics.graph.compiler.ExternalFileLoader;
+import org.simantics.graph.compiler.internal.ltk.Location;
+import org.simantics.graph.compiler.internal.ltk.Problem;
 import org.simantics.graph.compiler.internal.store.LocationStore;
 import org.simantics.graph.compiler.internal.store.PreValueStore;
 import org.simantics.graph.query.IGraph;
 import org.simantics.graph.store.GraphStore;
-import org.simantics.ltk.Location;
-import org.simantics.ltk.Problem;
 
 public enum LoadStringTemplate implements ITemplate {
        INSTANCE;

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/NewTemplate.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/NewTemplate.java
index 7894284745f354952419256919f7f59ca85df7cb..fd3f999cf65313704e4da9e3ce32a47f6b7503a8 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/NewTemplate.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/NewTemplate.java
@@ -3,9 +3,9 @@ package org.simantics.graph.compiler.internal.templates;
 import java.util.Collection;
 
 import org.simantics.graph.compiler.ExternalFileLoader;
+import org.simantics.graph.compiler.internal.ltk.Problem;
 import org.simantics.graph.query.IGraph;
 import org.simantics.graph.store.GraphStore;
-import org.simantics.ltk.Problem;
 
 public enum NewTemplate implements ITemplate {
        INSTANCE;

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/OrderedSetTemplate.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/OrderedSetTemplate.java
index 45aa25faa22739d9a89d166ff026bfb9c2de8c00..22679d626908bd446f9825cbfbd94340249c2219 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/OrderedSetTemplate.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/OrderedSetTemplate.java
@@ -3,10 +3,10 @@ package org.simantics.graph.compiler.internal.templates;
 import java.util.Collection;
 
 import org.simantics.graph.compiler.ExternalFileLoader;
+import org.simantics.graph.compiler.internal.ltk.Problem;
 import org.simantics.graph.query.IGraph;
 import org.simantics.graph.query.Paths;
 import org.simantics.graph.store.GraphStore;
-import org.simantics.ltk.Problem;
 
 public enum OrderedSetTemplate implements ITemplate {
        

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/TemplateDefinition.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/TemplateDefinition.java
index 1fedb881810f6fee32a9a82acb10600d658f7f64..a695ba566818a2d60f2606ec7935229c70f2feaa 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/TemplateDefinition.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/TemplateDefinition.java
@@ -1,9 +1,8 @@
 package org.simantics.graph.compiler.internal.templates;
 
-import gnu.trove.map.hash.TIntIntHashMap;
-
 import java.util.Collection;
 
+import org.simantics.graph.compiler.internal.ltk.Problem;
 import org.simantics.graph.compiler.internal.procedures.Compactify;
 import org.simantics.graph.compiler.internal.procedures.ConvertPreValues;
 import org.simantics.graph.compiler.internal.procedures.DefaultValueTyping;
@@ -14,7 +13,8 @@ import org.simantics.graph.query.Path;
 import org.simantics.graph.query.TransferableGraphConversion;
 import org.simantics.graph.representation.TransferableGraph1;
 import org.simantics.graph.store.GraphStore;
-import org.simantics.ltk.Problem;
+
+import gnu.trove.map.hash.TIntIntHashMap;
 
 public class TemplateDefinition {
        String[] parameters;

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/TemplateDefinitionStore.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/TemplateDefinitionStore.java
index 27d382648a925934d46f4cb3da4dac3224e8bd0e..ac2a39218cd77a010e045e98975bd6080617da34 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/TemplateDefinitionStore.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/TemplateDefinitionStore.java
@@ -1,14 +1,14 @@
 package org.simantics.graph.compiler.internal.templates;
 
+import org.simantics.graph.store.IStore;
+import org.simantics.graph.store.IndexMappingUtils;
+
 import gnu.trove.map.hash.TIntIntHashMap;
 import gnu.trove.map.hash.TIntObjectHashMap;
 import gnu.trove.procedure.TIntObjectProcedure;
 import gnu.trove.procedure.TObjectProcedure;
 import gnu.trove.set.hash.TIntHashSet;
 
-import org.simantics.graph.store.IStore;
-import org.simantics.graph.store.IndexMappingUtils;
-
 public class TemplateDefinitionStore implements IStore {
        TIntObjectHashMap<TemplateDefinition> templateDefinitions;
        TIntHashSet collisions = new TIntHashSet(); 

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/TemplateInstanceStore.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/TemplateInstanceStore.java
index 7d88a0276c6448233602b685b5fb78d943edf2e5..caf57dfcc01062d2197cb8c54621784eb996aae3 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/TemplateInstanceStore.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/TemplateInstanceStore.java
@@ -1,13 +1,13 @@
 package org.simantics.graph.compiler.internal.templates;
 
-import gnu.trove.map.hash.TIntIntHashMap;
-
 import java.util.ArrayList;
 import java.util.Collection;
 
 import org.simantics.graph.store.IStore;
 import org.simantics.graph.store.IndexMappingUtils;
 
+import gnu.trove.map.hash.TIntIntHashMap;
+
 public class TemplateInstanceStore implements IStore {
        ArrayList<int[]> templateInstances;
 

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/translation/DataTypeTranslator.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/translation/DataTypeTranslator.java
index 62b6bf616cf8525b49640c125bab53f87fad3553..b14373b3b2287fbcd4c5a951578a3b3dce6e64d0 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/translation/DataTypeTranslator.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/translation/DataTypeTranslator.java
@@ -1,7 +1,5 @@
 package org.simantics.graph.compiler.internal.translation;
 
-import gnu.trove.map.hash.THashMap;
-
 import java.util.Collection;
 
 import org.antlr.runtime.tree.Tree;
@@ -19,10 +17,12 @@ import org.simantics.databoard.type.OptionalType;
 import org.simantics.databoard.type.RecordType;
 import org.simantics.databoard.type.StringType;
 import org.simantics.databoard.type.UnionType;
+import org.simantics.graph.compiler.internal.ltk.ISource;
+import org.simantics.graph.compiler.internal.ltk.Problem;
+import org.simantics.graph.compiler.internal.ltk.antlr.ANTLRUtils;
 import org.simantics.graph.compiler.internal.parsing.GraphParser;
-import org.simantics.ltk.ISource;
-import org.simantics.ltk.Problem;
-import org.simantics.ltk.antlr.ANTLRUtils;
+
+import gnu.trove.map.hash.THashMap;
 
 public class DataTypeTranslator {
 

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/translation/DataValueTranslator.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/translation/DataValueTranslator.java
index 7423ba913420875ad031f8438f1934e0c742af3f..c3f277a4c67ce43b03dcf703d5d5a74407e8e5ce 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/translation/DataValueTranslator.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/translation/DataValueTranslator.java
@@ -20,10 +20,10 @@ import org.simantics.databoard.binding.UnionBinding;
 import org.simantics.databoard.binding.VariantBinding;
 import org.simantics.databoard.binding.error.BindingException;
 import org.simantics.databoard.type.Datatype;
+import org.simantics.graph.compiler.internal.ltk.ISource;
+import org.simantics.graph.compiler.internal.ltk.Problem;
+import org.simantics.graph.compiler.internal.ltk.antlr.ANTLRUtils;
 import org.simantics.graph.compiler.internal.parsing.GraphParser;
-import org.simantics.ltk.ISource;
-import org.simantics.ltk.Problem;
-import org.simantics.ltk.antlr.ANTLRUtils;
 
 public class DataValueTranslator {
        

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/translation/GraphTranslator.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/translation/GraphTranslator.java
index 623275277da031167d108b1c5e2503f444b5de64..63f3927919728b0da31912b817caa133ce4c9de6 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/translation/GraphTranslator.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/translation/GraphTranslator.java
@@ -1,13 +1,13 @@
 package org.simantics.graph.compiler.internal.translation;
 
-import gnu.trove.map.hash.TObjectIntHashMap;
-import gnu.trove.set.hash.TIntHashSet;
-
 import java.util.ArrayList;
 import java.util.Collection;
 
 import org.antlr.runtime.tree.Tree;
 import org.simantics.graph.compiler.SourceInfo.DefinitionPosition;
+import org.simantics.graph.compiler.internal.ltk.ISource;
+import org.simantics.graph.compiler.internal.ltk.Problem;
+import org.simantics.graph.compiler.internal.ltk.antlr.ANTLRUtils;
 import org.simantics.graph.compiler.internal.parsing.GraphParser;
 import org.simantics.graph.compiler.internal.store.LocationStore;
 import org.simantics.graph.compiler.internal.store.PreValueStore;
@@ -18,9 +18,9 @@ import org.simantics.graph.compiler.internal.values.TreeValue;
 import org.simantics.graph.query.Paths;
 import org.simantics.graph.query.UriUtils;
 import org.simantics.graph.store.GraphStore;
-import org.simantics.ltk.ISource;
-import org.simantics.ltk.Problem;
-import org.simantics.ltk.antlr.ANTLRUtils;
+
+import gnu.trove.map.hash.TObjectIntHashMap;
+import gnu.trove.set.hash.TIntHashSet;
 
 public class GraphTranslator extends GraphStore {
 

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/validation/ReportCollisions.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/validation/ReportCollisions.java
index 30efe78c4797b50a282214f06616c6de5cec908c..8b6f264d5cadac8a79ba438d247cca482a1135e5 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/validation/ReportCollisions.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/validation/ReportCollisions.java
@@ -3,12 +3,12 @@ package org.simantics.graph.compiler.internal.validation;
 import java.util.Collection;
 
 import org.simantics.graph.compiler.GraphCompilerPreferences;
+import org.simantics.graph.compiler.internal.ltk.Problem;
 import org.simantics.graph.compiler.internal.store.LocationStore;
 import org.simantics.graph.compiler.internal.templates.TemplateDefinitionStore;
 import org.simantics.graph.query.Res;
 import org.simantics.graph.store.GraphStore;
 import org.simantics.graph.store.StatementCollision;
-import org.simantics.ltk.Problem;
 
 public class ReportCollisions implements Runnable {
     GraphCompilerPreferences preferences;

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/validation/ValidateGraph.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/validation/ValidateGraph.java
index 13d84bfc21ef8b7f7eb6bda12c60d7a8fd934465..d65991fb300d6140b00c9bbd66a74ef08b877113 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/validation/ValidateGraph.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/validation/ValidateGraph.java
@@ -6,6 +6,8 @@ import java.util.concurrent.Callable;
 
 import org.simantics.graph.compiler.GraphCompilerPreferences;
 import org.simantics.graph.compiler.ValidationMode;
+import org.simantics.graph.compiler.internal.ltk.Location;
+import org.simantics.graph.compiler.internal.ltk.Problem;
 import org.simantics.graph.compiler.internal.store.LocationStore;
 import org.simantics.graph.query.CompositeGraph;
 import org.simantics.graph.query.Path;
@@ -14,8 +16,6 @@ import org.simantics.graph.query.Res;
 import org.simantics.graph.store.GraphStore;
 import org.simantics.graph.store.IdRes;
 import org.simantics.graph.utils.GraphExecutor;
-import org.simantics.ltk.Location;
-import org.simantics.ltk.Problem;
 
 public class ValidateGraph implements Runnable {
        CompositeGraph graph;

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/values/TreeValue.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/values/TreeValue.java
index 94509e32d34079d3dcc7cd268763f59bd2daebcf..ef1e067708a5eb4de0efc6db8085753a24e4bcb6 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/values/TreeValue.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/values/TreeValue.java
@@ -4,15 +4,15 @@ import java.util.Collection;
 
 import org.antlr.runtime.tree.Tree;
 import org.simantics.databoard.binding.Binding;
+import org.simantics.graph.compiler.internal.ltk.ISource;
+import org.simantics.graph.compiler.internal.ltk.Location;
+import org.simantics.graph.compiler.internal.ltk.Problem;
+import org.simantics.graph.compiler.internal.ltk.antlr.ANTLRUtils;
 import org.simantics.graph.compiler.internal.parsing.GraphParser;
 import org.simantics.graph.compiler.internal.store.IPreValue;
 import org.simantics.graph.compiler.internal.translation.DataValueTranslator;
 import org.simantics.graph.query.Path;
 import org.simantics.graph.query.Paths;
-import org.simantics.ltk.ISource;
-import org.simantics.ltk.Location;
-import org.simantics.ltk.Problem;
-import org.simantics.ltk.antlr.ANTLRUtils;
 
 public class TreeValue implements IPreValue {
 

diff --git a/bundles/org.simantics.graph.compiler/tests/org/simantics/graph/compiler/tests/GraphCompilerTests.java b/bundles/org.simantics.graph.compiler/tests/org/simantics/graph/compiler/tests/GraphCompilerTests.java
index c0e328d04a0e6dda87000fb351a2bb6426fd462b..7f004a5fe97c866527db0ede094c91f013d9beb6 100644 (file)
--- a/bundles/org.simantics.graph.compiler/tests/org/simantics/graph/compiler/tests/GraphCompilerTests.java
+++ b/bundles/org.simantics.graph.compiler/tests/org/simantics/graph/compiler/tests/GraphCompilerTests.java
@@ -4,17 +4,17 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
 
-import junit.framework.Assert;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.simantics.graph.compiler.CompilationResult;
 import org.simantics.graph.compiler.ExternalFileLoader;
 import org.simantics.graph.compiler.GraphCompiler;
 import org.simantics.graph.compiler.GraphCompilerPreferences;
+import org.simantics.graph.compiler.internal.ltk.ISource;
+import org.simantics.graph.compiler.internal.ltk.LocalResourceSource;
 import org.simantics.graph.representation.TransferableGraph1;
-import org.simantics.ltk.ISource;
-import org.simantics.ltk.LocalResourceSource;
+
+import junit.framework.Assert;
 
 public class GraphCompilerTests {
     

diff --git a/bundles/org.simantics.graph.compiler/tests/org/simantics/graph/compiler/tests/TestCompiler.java b/bundles/org.simantics.graph.compiler/tests/org/simantics/graph/compiler/tests/TestCompiler.java
index 0abbbb495e3f385498ceaaffb140156241733cb3..f878068ec8e15aa6065eefa13105f6e7f01733e3 100644 (file)
--- a/bundles/org.simantics.graph.compiler/tests/org/simantics/graph/compiler/tests/TestCompiler.java
+++ b/bundles/org.simantics.graph.compiler/tests/org/simantics/graph/compiler/tests/TestCompiler.java
@@ -10,9 +10,9 @@ import java.util.Collections;
 import org.simantics.graph.compiler.ExternalFileLoader;
 import org.simantics.graph.compiler.GraphCompiler;
 import org.simantics.graph.compiler.GraphCompilerPreferences;
+import org.simantics.graph.compiler.internal.ltk.FileSource;
+import org.simantics.graph.compiler.internal.ltk.ISource;
 import org.simantics.graph.representation.TransferableGraph1;
-import org.simantics.ltk.FileSource;
-import org.simantics.ltk.ISource;
 
 public class TestCompiler {
 

diff --git a/bundles/org.simantics.graph/META-INF/MANIFEST.MF b/bundles/org.simantics.graph/META-INF/MANIFEST.MF
index 6ae6e86fe08dfbfbbf7a901827a061f43d989732..d4f0ee755e0bd576c55425b82ffbeb42b7d9b363 100644 (file)
--- a/bundles/org.simantics.graph/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.graph/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Transferable Graph Runtime
 Bundle-SymbolicName: org.simantics.graph
 Bundle-Version: 1.1.15.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.simantics.databoard;bundle-version="0.5.1",
+Require-Bundle: org.simantics.databoard;bundle-version="0.6.6",
  gnu.trove3;bundle-version="3.0.0";visibility:=reexport,
  org.junit;bundle-version="4.12.0";resolution:=optional
 Export-Package: org.simantics.graph,

diff --git a/bundles/org.simantics.ltk.antlr/.classpath b/bundles/org.simantics.ltk.antlr/.classpath
deleted file mode 100644 (file)
index eca7bdb..0000000
--- a/bundles/org.simantics.ltk.antlr/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/bundles/org.simantics.ltk.antlr/.project b/bundles/org.simantics.ltk.antlr/.project
deleted file mode 100644 (file)
index 333699d..0000000
--- a/bundles/org.simantics.ltk.antlr/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.simantics.ltk.antlr</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.PluginNature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>

diff --git a/bundles/org.simantics.ltk.antlr/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.ltk.antlr/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index 0c68a61..0000000
--- a/bundles/org.simantics.ltk.antlr/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8

diff --git a/bundles/org.simantics.ltk.antlr/META-INF/MANIFEST.MF b/bundles/org.simantics.ltk.antlr/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index c44c99c..0000000
--- a/bundles/org.simantics.ltk.antlr/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Simantics Language Toolkit, ANTLR support
-Bundle-SymbolicName: org.simantics.ltk.antlr
-Bundle-Version: 1.1.12.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.simantics.ltk;bundle-version="1.0.0";visibility:=reexport
-Export-Package: org.simantics.ltk.antlr
-Import-Package: org.antlr.runtime;bundle-version="[3.5.2,4.0.0)",
- org.antlr.runtime.debug;bundle-version="[3.5.2,4.0.0)",
- org.antlr.runtime.misc;bundle-version="[3.5.2,4.0.0)",
- org.antlr.runtime.tree;bundle-version="[3.5.2,4.0.0)"

diff --git a/bundles/org.simantics.ltk.antlr/build.properties b/bundles/org.simantics.ltk.antlr/build.properties
deleted file mode 100644 (file)
index 34d2e4d..0000000
--- a/bundles/org.simantics.ltk.antlr/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .

diff --git a/bundles/org.simantics.ltk/.classpath b/bundles/org.simantics.ltk/.classpath
deleted file mode 100644 (file)
index eca7bdb..0000000
--- a/bundles/org.simantics.ltk/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/bundles/org.simantics.ltk/.project b/bundles/org.simantics.ltk/.project
deleted file mode 100644 (file)
index 0ff9805..0000000
--- a/bundles/org.simantics.ltk/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.simantics.ltk</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.PluginNature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>

diff --git a/bundles/org.simantics.ltk/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.ltk/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index 0c68a61..0000000
--- a/bundles/org.simantics.ltk/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8

diff --git a/bundles/org.simantics.ltk/META-INF/MANIFEST.MF b/bundles/org.simantics.ltk/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index e71c793..0000000
--- a/bundles/org.simantics.ltk/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Simantics Language Toolkit
-Bundle-SymbolicName: org.simantics.ltk
-Bundle-Version: 1.1.10.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.simantics.ltk

diff --git a/bundles/org.simantics.ltk/build.properties b/bundles/org.simantics.ltk/build.properties
deleted file mode 100644 (file)
index 34d2e4d..0000000
--- a/bundles/org.simantics.ltk/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .

diff --git a/bundles/org.simantics.ltk/src/org/simantics/ltk/Severity.java b/bundles/org.simantics.ltk/src/org/simantics/ltk/Severity.java
deleted file mode 100644 (file)
index b31a516..0000000
--- a/bundles/org.simantics.ltk/src/org/simantics/ltk/Severity.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.simantics.ltk;
-
-public enum Severity {
-       WARNING, ERROR
-}

diff --git a/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF
index 2a95d6fc60c369667176202b7d3ba8132aa6f404..ef01473085d4a70f5d77e4bd2e37b53b2cb8eb8d 100644 (file)
--- a/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF
@@ -49,7 +49,6 @@ Require-Bundle: org.simantics.project;bundle-version="1.0.0",
  org.simantics.scl.db;bundle-version="0.1.3",
  org.simantics.scl.ui;bundle-version="0.5.0",
  org.simantics.graph.compiler;bundle-version="1.1.11",
- org.simantics.ltk;bundle-version="1.1.10",
  org.eclipse.e4.core.di.annotations,
  org.eclipse.e4.core.contexts;bundle-version="1.4.0",
  org.eclipse.e4.ui.di,

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/CompilePGraphsAction.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/CompilePGraphsAction.java
index d71d1e83729a297eb15c5806c069fe5e587da930..0c93e6c2055652a4ce48e003bd646f22009c8d76 100644 (file)
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/CompilePGraphsAction.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/CompilePGraphsAction.java
@@ -18,7 +18,7 @@ import org.simantics.db.Resource;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.adapter.ActionFactory;
 import org.simantics.graph.compiler.CompilationResult;
-import org.simantics.ltk.Problem;
+import org.simantics.graph.compiler.internal.ltk.Problem;
 import org.simantics.modeling.CompilePGraphs;
 import org.simantics.modeling.ui.Activator;
 import org.simantics.utils.ui.ExceptionUtils;

diff --git a/bundles/org.simantics.modeling/META-INF/MANIFEST.MF b/bundles/org.simantics.modeling/META-INF/MANIFEST.MF
index 2c0a7f14530892d7ff49d1b3633b7cd35a8fc528..a4375c543414f27cc4e80f1f27549923eb5d20b6 100644 (file)
--- a/bundles/org.simantics.modeling/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.modeling/META-INF/MANIFEST.MF
@@ -40,7 +40,6 @@ Require-Bundle: org.simantics.simulation;bundle-version="1.0.0",
  org.slf4j.api,
  org.simantics.graphfile.ontology,
  org.apache.batik,
- org.simantics.ltk,
  org.simantics.graph.compiler
 Export-Package: org.simantics.modeling,
  org.simantics.modeling.actions,

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/CompilePGraphs.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/CompilePGraphs.java
index adc4f47f517fd3c8150027c003cb7c0b5b1e9002..879a57d19a637935bd7164fb03c32af6fe738088 100644 (file)
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/CompilePGraphs.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/CompilePGraphs.java
@@ -51,6 +51,8 @@ import org.simantics.graph.compiler.ExternalFileLoader;
 import org.simantics.graph.compiler.GraphCompiler;
 import org.simantics.graph.compiler.GraphCompilerPreferences;
 import org.simantics.graph.compiler.ValidationMode;
+import org.simantics.graph.compiler.internal.ltk.ISource;
+import org.simantics.graph.compiler.internal.ltk.Problem;
 import org.simantics.graph.db.TransferableGraphException;
 import org.simantics.graph.db.TransferableGraphSource;
 import org.simantics.graph.db.TransferableGraphs;
@@ -61,8 +63,6 @@ import org.simantics.graph.representation.Root;
 import org.simantics.graph.representation.TransferableGraph1;
 import org.simantics.graphfile.ontology.GraphFileResource;
 import org.simantics.layer0.Layer0;
-import org.simantics.ltk.ISource;
-import org.simantics.ltk.Problem;
 import org.simantics.modeling.internal.Activator;
 import org.simantics.utils.FileUtils;
 import org.simantics.utils.datastructures.Pair;

diff --git a/bundles/org.simantics.project/META-INF/MANIFEST.MF b/bundles/org.simantics.project/META-INF/MANIFEST.MF
index 42e503aab6b432ee9bb7f18536484aea7dfb3b11..184681c69b460a2bae2cc408c9b07cb9c09a59c4 100644 (file)
--- a/bundles/org.simantics.project/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.project/META-INF/MANIFEST.MF
@@ -37,7 +37,6 @@ Require-Bundle: org.simantics.db.layer0;bundle-version="[0.8.0,2.0.0)",
  org.eclipse.swt;bundle-version="3.6.0";resolution:=optional,
  org.eclipse.core.resources;bundle-version="3.6.0";resolution:=optional,
  org.simantics.graph.compiler;bundle-version="1.1.10",
- org.simantics.ltk;bundle-version="1.1.10",
  org.slf4j.api
 Export-Package: org.eclipse.equinox.internal.p2.ui.query,
  org.eclipse.equinox.internal.provisional.p2.installer,

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 344b2d6cf94a6d43c446ea07bb073ed241fd4507..d5c88782a87e42d980773fd8542d8af087327e46 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
@@ -51,12 +51,12 @@ import org.simantics.graph.compiler.CompilationResult;
 import org.simantics.graph.compiler.GraphCompiler;
 import org.simantics.graph.compiler.GraphCompilerPreferences;
 import org.simantics.graph.compiler.ValidationMode;
+import org.simantics.graph.compiler.internal.ltk.FileSource;
+import org.simantics.graph.compiler.internal.ltk.ISource;
+import org.simantics.graph.compiler.internal.ltk.Problem;
 import org.simantics.graph.representation.Extensions;
 import org.simantics.graph.representation.TransferableGraph1;
 import org.simantics.graph.representation.TransferableGraphFileReader;
-import org.simantics.ltk.FileSource;
-import org.simantics.ltk.ISource;
-import org.simantics.ltk.Problem;
 import org.simantics.scl.reflection.OntologyVersions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/bundles/pom.xml b/bundles/pom.xml
index bcefad659f03cc6bcf32041b6541236914e61e1e..88535ff46103c6d8dc6905083321a5e4221550c1 100644 (file)
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -158,8 +158,6 @@
                <module>org.simantics.logback.configuration</module>
         <module>org.simantics.logging</module>
         <module>org.simantics.logging.ui</module>
-               <module>org.simantics.ltk</module>
-               <module>org.simantics.ltk.antlr</module>
                <module>org.simantics.lz4</module>
                <module>org.simantics.mapping</module>
                <module>org.simantics.message</module>

diff --git a/features/org.simantics.platform.feature/feature.xml b/features/org.simantics.platform.feature/feature.xml
index 5cbeefc85d91fc201c655bcfecb4cfb9d4bf6826..b3ce97345c398deb7e6867c9fd02dd11cbdd8129 100644 (file)
--- a/features/org.simantics.platform.feature/feature.xml
+++ b/features/org.simantics.platform.feature/feature.xml
@@ -90,20 +90,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.simantics.ltk"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.simantics.ltk.antlr"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.simantics.graphfile.ontology"
          download-size="0"