From 99398874bce86eaa22abeb1ef4c9cbb05decc55e Mon Sep 17 00:00:00 2001 From: lempinen Date: Tue, 27 Mar 2012 09:17:59 +0000 Subject: [PATCH] Removed elements2 (refs #3329) git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@24547 ac1ea38d-2e2b-0410-8846-a27921b304fc --- .../sysdyn/ui/editor/SysdynConnectionAdvisor.java | 4 +--- .../CreateVariablesShortcutParticipant.java | 15 +++++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) 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 dbabc430..81e70e1f 100644 --- 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; import org.simantics.g2d.element.IElement; import org.simantics.g2d.element.handler.impl.StaticObjectAdapter; -import org.simantics.structural.stubs.StructuralResource2; import org.simantics.structural2.modelingRules.CPIgnore; import org.simantics.structural2.modelingRules.ConnectionJudgement; import org.simantics.structural2.modelingRules.ConnectionJudgementType; import org.simantics.structural2.modelingRules.IConnectionPoint; import org.simantics.structural2.modelingRules.IModelingRules; import org.simantics.sysdyn.SysdynResource; -import org.simantics.sysdyn.ui.elements2.CloudFactory.CloudSceneGraph; +import org.simantics.sysdyn.ui.elements.CloudFactory.CloudSceneGraph; public class SysdynConnectionAdvisor implements IConnectionAdvisor { @@ -84,7 +83,6 @@ public class SysdynConnectionAdvisor implements IConnectionAdvisor { Resource endElementResource = soa.adapt(Resource.class); DiagramResource dr = DiagramResource.getInstance(g); - StructuralResource2 str2 = StructuralResource2.getInstance(g); Resource terminal2 = ((ResourceTerminal) term2).getResource(); SysdynResource sr = SysdynResource.getInstance(g); 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 03d91fe0..43a55896 100644 --- 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; import org.simantics.g2d.participant.MouseUtil.MouseInfo; import org.simantics.scenegraph.g2d.G2DParentNode; -import org.simantics.scenegraph.g2d.events.KeyEvent; -import org.simantics.scenegraph.g2d.events.MouseEvent; import org.simantics.scenegraph.g2d.events.EventHandlerReflection.EventHandler; +import org.simantics.scenegraph.g2d.events.KeyEvent; import org.simantics.scenegraph.g2d.events.KeyEvent.KeyPressedEvent; import org.simantics.scenegraph.g2d.events.KeyEvent.KeyReleasedEvent; -import org.simantics.scenegraph.g2d.events.MouseEvent.MouseClickEvent; +import org.simantics.scenegraph.g2d.events.MouseEvent; import org.simantics.scenegraph.g2d.events.MouseEvent.MouseMovedEvent; import org.simantics.scenegraph.g2d.nodes.ShapeNode; import org.simantics.sysdyn.SysdynResource; -import org.simantics.sysdyn.ui.elements2.AuxiliaryFactory; -import org.simantics.sysdyn.ui.elements2.CloudFactory; -import org.simantics.sysdyn.ui.elements2.InputFactory; -import org.simantics.sysdyn.ui.elements2.StockFactory; -import org.simantics.sysdyn.ui.elements2.ValveFactory; +import org.simantics.sysdyn.ui.elements.AuxiliaryFactory; +import org.simantics.sysdyn.ui.elements.CloudFactory; +import org.simantics.sysdyn.ui.elements.InputFactory; +import org.simantics.sysdyn.ui.elements.StockFactory; +import org.simantics.sysdyn.ui.elements.ValveFactory; import org.simantics.ui.SimanticsUI; import org.simantics.utils.datastructures.Callback; import org.simantics.utils.ui.ExceptionUtils; -- 2.47.1