diff options
| author | Juergen Haug | 2016-09-28 15:39:57 +0000 |
|---|---|---|
| committer | Juergen Haug | 2016-09-28 17:24:59 +0000 |
| commit | 997adc473cb628a22ae725d9a8e0cfd59c21ce63 (patch) | |
| tree | 602e7a1907a5b8eafff8ca22e413cc2b35e0685e /plugins/org.eclipse.etrice.ui.structure | |
| parent | 0f9c9c6e619bec471621d34340f3f4e35828f36d (diff) | |
| download | org.eclipse.etrice-997adc473cb628a22ae725d9a8e0cfd59c21ce63.tar.gz org.eclipse.etrice-997adc473cb628a22ae725d9a8e0cfd59c21ce63.tar.xz org.eclipse.etrice-997adc473cb628a22ae725d9a8e0cfd59c21ce63.zip | |
[diagram] Bug 502073 - improved naming for new elements
Change-Id: I7c5ac7aceb879f254906b71789236ebebe3af833
Diffstat (limited to 'plugins/org.eclipse.etrice.ui.structure')
4 files changed, 6 insertions, 6 deletions
diff --git a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/ActorContainerRefSupport.java b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/ActorContainerRefSupport.java index 77e42b839..b47e95b2d 100644 --- a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/ActorContainerRefSupport.java +++ b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/ActorContainerRefSupport.java @@ -431,7 +431,7 @@ public class ActorContainerRefSupport { newRef = ssr; } - newRef.setName(SupportUtil.getInstance().getRoomUtil().getUniqueActorContainerRefName(sc)); + newRef.setName(SupportUtil.getInstance().getRoomUtil().getUniqueName("ref", sc)); IScopeProvider scopeProvider = ((DiagramTypeProvider)getFeatureProvider().getDiagramTypeProvider()).getScopeProvider(); EReference reference = (newRef instanceof ActorRef)?RoomPackage.eINSTANCE.getActorRef_Type():RoomPackage.eINSTANCE.getSubSystemRef_Type(); diff --git a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/PortSupport.java b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/PortSupport.java index 36c9ee4b6..b958b1c85 100644 --- a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/PortSupport.java +++ b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/PortSupport.java @@ -98,7 +98,7 @@ public class PortSupport extends InterfaceItemSupport { // create Port Port port = RoomFactory.eINSTANCE.createPort(); - port.setName(SupportUtil.getInstance().getRoomUtil().getUniqueInterfaceItemName("p", acc)); + port.setName(SupportUtil.getInstance().getRoomUtil().getUniqueName("p", acc)); ExternalPort xp = null; if (acc instanceof ActorClass) { diff --git a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/SPPSupport.java b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/SPPSupport.java index edf2e85be..56a115129 100644 --- a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/SPPSupport.java +++ b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/SPPSupport.java @@ -97,7 +97,7 @@ public class SPPSupport extends InterfaceItemSupport { // create SPP SPP spp = RoomFactory.eINSTANCE.createSPP(); - spp.setName(SupportUtil.getInstance().getRoomUtil().getUniqueInterfaceItemName("spp", acc)); + spp.setName(SupportUtil.getInstance().getRoomUtil().getUniqueName("spp", acc)); acc.getServiceProvisionPoints().add(spp); diff --git a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/SupportUtil.java b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/SupportUtil.java index aaa6dda3c..e23383662 100644 --- a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/SupportUtil.java +++ b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/SupportUtil.java @@ -30,7 +30,7 @@ import org.eclipse.etrice.core.room.SPP; import org.eclipse.etrice.core.room.SPPoint; import org.eclipse.etrice.core.room.StructureClass; import org.eclipse.etrice.core.room.util.RoomHelpers; -import org.eclipse.etrice.core.room.util.RoomUtil; +import org.eclipse.etrice.core.room.util.RoomNewNamingUtil; import org.eclipse.etrice.core.ui.RoomUiModule; import org.eclipse.etrice.core.validation.ValidationUtil; import org.eclipse.graphiti.features.IFeatureProvider; @@ -78,7 +78,7 @@ public class SupportUtil { @Inject private RoomNameProvider roomNameProvider; @Inject - private RoomUtil roomUtil; + private RoomNewNamingUtil roomUtil; /** * @return the roomHelpers @@ -97,7 +97,7 @@ public class SupportUtil { /** * @return the roomUtil */ - public RoomUtil getRoomUtil() { + public RoomNewNamingUtil getRoomUtil() { return roomUtil; } |