X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2Factions%2FCreateShapeHandler.java;h=aeaa212c12ce99a2a72c1db219dfd12cb01511f7;hp=75c702bedd3d7eba673bf663a5bfa2d4efcaa953;hb=47269fe0acb894f346810417d950a1ab59cdc0ea;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/CreateShapeHandler.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/CreateShapeHandler.java
index 75c702bed..aeaa212c1 100644
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/CreateShapeHandler.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/CreateShapeHandler.java
@@ -9,6 +9,7 @@ import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.eclipse.ui.part.MultiPageEditorPart;
+import org.simantics.Simantics;
 import org.simantics.databoard.Bindings;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
@@ -28,7 +29,6 @@ import org.simantics.layer0.Layer0;
 import org.simantics.layer0.utils.direct.GraphUtils;
 import org.simantics.modeling.ModelingResources;
 import org.simantics.structural.stubs.StructuralResource2;
-import org.simantics.ui.SimanticsUI;
 import org.simantics.ui.workbench.IResourceEditorInput;
 import org.simantics.ui.workbench.ResourceEditorInput;
 
@@ -43,7 +43,7 @@ public abstract class CreateShapeHandler extends AbstractHandler {
 
     public Object addElement(final double mposX, final double mposY, final Resource composite) {
         final String data = getDefaultElementData();
-        SimanticsUI.getSession().asyncRequest(new WriteRequest() {
+        Simantics.getSession().asyncRequest(new WriteRequest() {
             @Override
             public void perform(WriteGraph g) throws DatabaseException {
                 Layer0 L0 = Layer0.getInstance(g);
@@ -75,7 +75,7 @@ public abstract class CreateShapeHandler extends AbstractHandler {
             final ResourceArray ra = in.getResourceArray();
             ResourceArray symbolEditorInput;
             try {
-                symbolEditorInput = SimanticsUI.getSession().syncRequest(new Read<ResourceArray>() {
+                symbolEditorInput = Simantics.getSession().syncRequest(new Read<ResourceArray>() {
                     @Override
                     public ResourceArray perform(ReadGraph graph) throws DatabaseException {
                         StructuralResource2 sr = StructuralResource2.getInstance(graph);
@@ -87,9 +87,9 @@ public abstract class CreateShapeHandler extends AbstractHandler {
                     }
                 });
 
-                IEditorPart[] eps = rfe.findEditors(new ResourceEditorInput("org.simantics.modeling.ui.symbolEditor", symbolEditorInput));
+                IEditorPart[] eps = rfe.findEditors(new ResourceEditorInput("org.simantics.modeling.ui.symbolEditor", symbolEditorInput)); //$NON-NLS-1$
                 if (eps.length == 0) {
-                    System.out.println("symbol editor part not found from multi page editor part: " + ap);
+                    System.out.println("symbol editor part not found from multi page editor part: " + ap); //$NON-NLS-1$
                     return null;
                 }
                 viewer = eps[0];
@@ -104,12 +104,12 @@ public abstract class CreateShapeHandler extends AbstractHandler {
         }
         ICanvasContext ctx = (ICanvasContext) viewer.getAdapter(ICanvasContext.class);
         if (ctx == null) {
-            System.out.println("No canvas context");
+            System.out.println("No canvas context"); //$NON-NLS-1$
             return null;
         }
         MouseInfo minfo = ctx.getSingleItem(MouseUtil.class).getMousePressedInfo(0);
         if(minfo == null) {
-            System.out.println("No mouse info");
+            System.out.println("No mouse info"); //$NON-NLS-1$
             return null;
         }
         final Point2D mpos = minfo.canvasPosition;