From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 7 Dec 2018 11:31:48 +0000 (+0200)
Subject: Changed SimanticsUI use to Simantics
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Frelease%2F1.36.0;p=simantics%2F3d.git

Changed SimanticsUI use to Simantics

gitlab #1
---

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 e1000c16..972d7977 100644
--- 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;
 import org.simantics.objmap.structural.IStructuralObject;
 import org.simantics.opencascade.SolidModelProvider;
-import org.simantics.ui.SimanticsUI;
+import org.simantics.Simantics;
 
 public class CSGSolidModelAdapter implements SolidModelProvider, IAdaptable, IStructuralObject {
 	
@@ -42,7 +42,7 @@ public class CSGSolidModelAdapter implements SolidModelProvider, IAdaptable, ISt
 	
 	@Override
 	public Collection<TopoDS_Shape> getModel() throws Exception {
-		return SimanticsUI.getSession().syncRequest(new Read<Collection<TopoDS_Shape>>() {
+		return Simantics.getSession().syncRequest(new Read<Collection<TopoDS_Shape>>() {
 			@Override
 			public Collection<TopoDS_Shape> perform(ReadGraph graph)
 					throws DatabaseException {
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 08d2f76b..b44a7693 100644
--- 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;
 import org.simantics.objmap.graph.schema.MappingSchemas;
 import org.simantics.objmap.graph.schema.SimpleSchema;
-import org.simantics.ui.SimanticsUI;
+import org.simantics.Simantics;
 
 public class SchemaBuilder {
 	
 	public static IMappingSchema<Resource,Object> getSchema() throws DatabaseException{
-		return SimanticsUI.getSession().syncRequest(new Read<IMappingSchema<Resource,Object>>() {
+		return Simantics.getSession().syncRequest(new Read<IMappingSchema<Resource,Object>>() {
 			@Override
 			public IMappingSchema<Resource,Object> perform(ReadGraph g)
 					throws DatabaseException {
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 53641e51..9eddcd44 100644
--- 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;
 import org.simantics.project.IProject;
 import org.simantics.project.ProjectKeys;
-import org.simantics.ui.SimanticsUI;
+import org.simantics.Simantics;
 import org.simantics.utils.ui.ErrorLogger;
 import org.simantics.utils.ui.ExceptionUtils;
 import org.simantics.utils.ui.workbench.StringMemento;
@@ -61,7 +61,7 @@ public abstract class ModelExportWizard<T extends IExportModel> extends Wizard i
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
 		readPreferences();
 
-        ISessionContext ctx = SimanticsUI.getSessionContext();
+        ISessionContext ctx = Simantics.getSessionContext();
         if (ctx == null)
             return;
         IProject project = ctx.getHint(ProjectKeys.KEY_PROJECT);