Changed SimanticsUI use to Simantics

gitlab #1

(cherry picked from commit cda637e8caba5a58f2cc5ec0a435070f628fb2fb)

diff --git a/org.simantics.g3d.csg/src/org/simantics/g3d/csg/adapters/CSGSolidModelAdapter.java b/org.simantics.g3d.csg/src/org/simantics/g3d/csg/adapters/CSGSolidModelAdapter.java
index e1000c1692bc6ef063ccb3ab5fa13ed872809a4f..972d797748980ba7055167ed7c192bde05f2c4db 100644 (file)
--- a/org.simantics.g3d.csg/src/org/simantics/g3d/csg/adapters/CSGSolidModelAdapter.java
+++ b/org.simantics.g3d.csg/src/org/simantics/g3d/csg/adapters/CSGSolidModelAdapter.java
@@ -30,7 +30,7 @@ import org.simantics.objmap.graph.Mappings;
 import org.simantics.objmap.graph.schema.IMappingSchema;\r
 import org.simantics.objmap.structural.IStructuralObject;\r
 import org.simantics.opencascade.SolidModelProvider;\r
-import org.simantics.ui.SimanticsUI;\r
+import org.simantics.Simantics;\r
 \r
 public class CSGSolidModelAdapter implements SolidModelProvider, IAdaptable, IStructuralObject {\r
        \r
@@ -42,7 +42,7 @@ public class CSGSolidModelAdapter implements SolidModelProvider, IAdaptable, ISt
        \r
        @Override\r
        public Collection<TopoDS_Shape> getModel() throws Exception {\r
-               return SimanticsUI.getSession().syncRequest(new Read<Collection<TopoDS_Shape>>() {\r
+               return Simantics.getSession().syncRequest(new Read<Collection<TopoDS_Shape>>() {\r
                        @Override\r
                        public Collection<TopoDS_Shape> perform(ReadGraph graph)\r
                                        throws DatabaseException {\r

diff --git a/org.simantics.g3d.csg/src/org/simantics/g3d/csg/scenegraph2/SchemaBuilder.java b/org.simantics.g3d.csg/src/org/simantics/g3d/csg/scenegraph2/SchemaBuilder.java
index 08d2f76b5f2987f819ac197597e3357350d92760..b44a7693c97e89f3a4072ea0ec373fc5273c19ca 100644 (file)
--- a/org.simantics.g3d.csg/src/org/simantics/g3d/csg/scenegraph2/SchemaBuilder.java
+++ b/org.simantics.g3d.csg/src/org/simantics/g3d/csg/scenegraph2/SchemaBuilder.java
@@ -18,12 +18,12 @@ import org.simantics.db.request.Read;
 import org.simantics.objmap.graph.schema.IMappingSchema;\r
 import org.simantics.objmap.graph.schema.MappingSchemas;\r
 import org.simantics.objmap.graph.schema.SimpleSchema;\r
-import org.simantics.ui.SimanticsUI;\r
+import org.simantics.Simantics;\r
 \r
 public class SchemaBuilder {\r
        \r
        public static IMappingSchema<Resource,Object> getSchema() throws DatabaseException{\r
-               return SimanticsUI.getSession().syncRequest(new Read<IMappingSchema<Resource,Object>>() {\r
+               return Simantics.getSession().syncRequest(new Read<IMappingSchema<Resource,Object>>() {\r
                        @Override\r
                        public IMappingSchema<Resource,Object> perform(ReadGraph g)\r
                                        throws DatabaseException {\r

diff --git a/org.simantics.g3d/src/org/simantics/g3d/wizard/ModelExportWizard.java b/org.simantics.g3d/src/org/simantics/g3d/wizard/ModelExportWizard.java
index 53641e51ea5ca771c5ec321ab3a1ab5346da36e3..9eddcd44c957b387cf76fb801b0b008e8eee4138 100644 (file)
--- a/org.simantics.g3d/src/org/simantics/g3d/wizard/ModelExportWizard.java
+++ b/org.simantics.g3d/src/org/simantics/g3d/wizard/ModelExportWizard.java
@@ -33,7 +33,7 @@ import org.eclipse.ui.IWorkbench;
 import org.simantics.db.management.ISessionContext;\r
 import org.simantics.project.IProject;\r
 import org.simantics.project.ProjectKeys;\r
-import org.simantics.ui.SimanticsUI;\r
+import org.simantics.Simantics;\r
 import org.simantics.utils.ui.ErrorLogger;\r
 import org.simantics.utils.ui.ExceptionUtils;\r
 import org.simantics.utils.ui.workbench.StringMemento;\r
@@ -61,7 +61,7 @@ public abstract class ModelExportWizard<T extends IExportModel> extends Wizard i
        public void init(IWorkbench workbench, IStructuredSelection selection) {\r
                readPreferences();\r
 \r
-        ISessionContext ctx = SimanticsUI.getSessionContext();\r
+        ISessionContext ctx = Simantics.getSessionContext();\r
         if (ctx == null)\r
             return;\r
         IProject project = ctx.getHint(ProjectKeys.KEY_PROJECT);\r