Merge remote-tracking branch 'origin/master' into private/antti2

[simantics/platform.git] / bundles / org.simantics.db.layer0 / src / org / simantics / db / layer0 / variable / StandardVariableBuilder.java

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/StandardVariableBuilder.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/StandardVariableBuilder.java
index 6e83fe139fe77f5dadc3dd069f4bc6e6de56038c..992e3e6990fba165c0fd6c6ca901a479b4521730 100644 (file)
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/StandardVariableBuilder.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/StandardVariableBuilder.java
@@ -6,25 +6,25 @@ import org.simantics.db.exception.DatabaseException;
 
 public class StandardVariableBuilder<Node> implements VariableBuilder<Node> {
 
-    private static StandardVariableBuilder INSTANCE = null;
-    
+    private static StandardVariableBuilder<?> INSTANCE = null;
+
     private StandardVariableBuilder() {}
-    
-    public static synchronized StandardVariableBuilder get() {
+
+    public static synchronized StandardVariableBuilder<?> get() {
         if(INSTANCE == null) {
             INSTANCE = new StandardVariableBuilder<>();
         }
         return INSTANCE;
     }
 
-       @Override
-       public Variable buildChild(ReadGraph graph, Variable parent, VariableNode<Node> node, Resource child) {
-               return new StandardGraphChildVariable(parent, node, child);
-       }
+    @Override
+    public Variable buildChild(ReadGraph graph, Variable parent, VariableNode<Node> node, Resource child) {
+        return new StandardGraphChildVariable(parent, node, child);
+    }
 
-       @Override
-       public Variable buildProperty(ReadGraph graph, Variable parent, VariableNode<Node> node, Resource subject, Resource predicate) throws DatabaseException {
-               return new StandardGraphPropertyVariable(graph, parent, node, subject, predicate);
-       }
+    @Override
+    public Variable buildProperty(ReadGraph graph, Variable parent, VariableNode<Node> node, Resource subject, Resource predicate) throws DatabaseException {
+        return new StandardGraphPropertyVariable(graph, parent, node, subject, predicate);
+    }
 
 }