Removed elements2 (refs #3329)

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@24547 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/SysdynConnectionAdvisor.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/SysdynConnectionAdvisor.java
index dbabc430621fcaf944d0d0e23a9caae81ee01728..81e70e1f50129c888fa05603e3e27b011bf130a4 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/SysdynConnectionAdvisor.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/SysdynConnectionAdvisor.java
@@ -27,14 +27,13 @@ import org.simantics.g2d.diagram.handler.Topology.Terminal;
 import org.simantics.g2d.element.ElementUtils;\r
 import org.simantics.g2d.element.IElement;\r
 import org.simantics.g2d.element.handler.impl.StaticObjectAdapter;\r
-import org.simantics.structural.stubs.StructuralResource2;\r
 import org.simantics.structural2.modelingRules.CPIgnore;\r
 import org.simantics.structural2.modelingRules.ConnectionJudgement;\r
 import org.simantics.structural2.modelingRules.ConnectionJudgementType;\r
 import org.simantics.structural2.modelingRules.IConnectionPoint;\r
 import org.simantics.structural2.modelingRules.IModelingRules;\r
 import org.simantics.sysdyn.SysdynResource;\r
-import org.simantics.sysdyn.ui.elements2.CloudFactory.CloudSceneGraph;\r
+import org.simantics.sysdyn.ui.elements.CloudFactory.CloudSceneGraph;\r
 \r
 public class SysdynConnectionAdvisor  implements IConnectionAdvisor {\r
 \r
@@ -84,7 +83,6 @@ public class SysdynConnectionAdvisor  implements IConnectionAdvisor {
                                                Resource endElementResource = soa.adapt(Resource.class);\r
                                                \r
                                                DiagramResource dr = DiagramResource.getInstance(g);\r
-                                               StructuralResource2 str2  = StructuralResource2.getInstance(g);\r
                                                Resource terminal2 = ((ResourceTerminal) term2).getResource();\r
                                                SysdynResource sr = SysdynResource.getInstance(g);\r
 \r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/CreateVariablesShortcutParticipant.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/CreateVariablesShortcutParticipant.java
index 03d91fe01d63e9f6b928cb0dc0b961e147b473df..43a558969a35b7813e14a96915985560c7977bdd 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/CreateVariablesShortcutParticipant.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/CreateVariablesShortcutParticipant.java
@@ -37,20 +37,19 @@ import org.simantics.g2d.element.IElement;
 import org.simantics.g2d.participant.MouseUtil;\r
 import org.simantics.g2d.participant.MouseUtil.MouseInfo;\r
 import org.simantics.scenegraph.g2d.G2DParentNode;\r
-import org.simantics.scenegraph.g2d.events.KeyEvent;\r
-import org.simantics.scenegraph.g2d.events.MouseEvent;\r
 import org.simantics.scenegraph.g2d.events.EventHandlerReflection.EventHandler;\r
+import org.simantics.scenegraph.g2d.events.KeyEvent;\r
 import org.simantics.scenegraph.g2d.events.KeyEvent.KeyPressedEvent;\r
 import org.simantics.scenegraph.g2d.events.KeyEvent.KeyReleasedEvent;\r
-import org.simantics.scenegraph.g2d.events.MouseEvent.MouseClickEvent;\r
+import org.simantics.scenegraph.g2d.events.MouseEvent;\r
 import org.simantics.scenegraph.g2d.events.MouseEvent.MouseMovedEvent;\r
 import org.simantics.scenegraph.g2d.nodes.ShapeNode;\r
 import org.simantics.sysdyn.SysdynResource;\r
-import org.simantics.sysdyn.ui.elements2.AuxiliaryFactory;\r
-import org.simantics.sysdyn.ui.elements2.CloudFactory;\r
-import org.simantics.sysdyn.ui.elements2.InputFactory;\r
-import org.simantics.sysdyn.ui.elements2.StockFactory;\r
-import org.simantics.sysdyn.ui.elements2.ValveFactory;\r
+import org.simantics.sysdyn.ui.elements.AuxiliaryFactory;\r
+import org.simantics.sysdyn.ui.elements.CloudFactory;\r
+import org.simantics.sysdyn.ui.elements.InputFactory;\r
+import org.simantics.sysdyn.ui.elements.StockFactory;\r
+import org.simantics.sysdyn.ui.elements.ValveFactory;\r
 import org.simantics.ui.SimanticsUI;\r
 import org.simantics.utils.datastructures.Callback;\r
 import org.simantics.utils.ui.ExceptionUtils;\r