diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/AbstractActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/AbstractActionItemProvider.java index acd6541a325f7f32f1402797ff95174c26476df7..fa80eebb5898f1bf104b57d74e8bb280b0c546e6 100644 --- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/AbstractActionItemProvider.java +++ b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/AbstractActionItemProvider.java @@ -4,23 +4,15 @@ package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider; +import edu.kit.ipd.descartes.core.provider.EntityItemProvider; import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin; - +import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.AbstractAction; import java.util.Collection; import java.util.List; - import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; /** * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.AbstractAction} object. @@ -29,13 +21,7 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter; * @generated */ public class AbstractActionItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { + extends EntityItemProvider { /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> @@ -80,7 +66,10 @@ public class AbstractActionItemProvider */ @Override public String getText(Object object) { - return getString("_UI_AbstractAction_type"); + String label = ((AbstractAction)object).getName(); + return label == null || label.length() == 0 ? + getString("_UI_AbstractAction_type") : + getString("_UI_AbstractAction_type") + " " + label; } diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/AcquireActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/AcquireActionItemProvider.java index d64d14db0e2c6000c77246cd51564aebdcee5d65..4da59962b9a3c82267cbf59c5765f26c7f32182d 100644 --- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/AcquireActionItemProvider.java +++ b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/AcquireActionItemProvider.java @@ -4,6 +4,7 @@ package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider; +import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.AcquireAction; import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage; import java.util.Collection; @@ -89,7 +90,10 @@ public class AcquireActionItemProvider extends AbstractActionItemProvider { */ @Override public String getText(Object object) { - return getString("_UI_AcquireAction_type"); + String label = ((AcquireAction)object).getName(); + return label == null || label.length() == 0 ? + getString("_UI_AcquireAction_type") : + getString("_UI_AcquireAction_type") + " " + label; } diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/BlackBoxBehaviorItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/BlackBoxBehaviorItemProvider.java index 1637e228ce143d65c9896ed8bbbfa6072c5bd5df..568fd196cf98c444dfc8cf1659173f2110f742d3 100644 --- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/BlackBoxBehaviorItemProvider.java +++ b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/BlackBoxBehaviorItemProvider.java @@ -7,16 +7,11 @@ package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider; import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.BlackBoxBehavior; import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorFactory; import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage; - import java.util.Collection; import java.util.List; - import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - -import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/BranchActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/BranchActionItemProvider.java index 00b55571789b51e51b4e0c710a39704ac394147e..695c92a44b0e5bf8e737f45afab10216b4ea3ced 100644 --- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/BranchActionItemProvider.java +++ b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/BranchActionItemProvider.java @@ -101,7 +101,10 @@ public class BranchActionItemProvider extends AbstractActionItemProvider { */ @Override public String getText(Object object) { - return getString("_UI_BranchAction_type"); + String label = ((BranchAction)object).getName(); + return label == null || label.length() == 0 ? + getString("_UI_BranchAction_type") : + getString("_UI_BranchAction_type") + " " + label; } diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ExternalCallActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ExternalCallActionItemProvider.java index c0cfc0eccaaf21ae8ef0a86ff4dfbd3e3f97c621..bcd9d3911be0d7e3c95992abff1f43ec803bbfc0 100644 --- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ExternalCallActionItemProvider.java +++ b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ExternalCallActionItemProvider.java @@ -100,7 +100,10 @@ public class ExternalCallActionItemProvider extends AbstractActionItemProvider { */ @Override public String getText(Object object) { - return getString("_UI_ExternalCallAction_type"); + String label = ((ExternalCallAction)object).getName(); + return label == null || label.length() == 0 ? + getString("_UI_ExternalCallAction_type") : + getString("_UI_ExternalCallAction_type") + " " + label; } diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/FineGrainedBehaviorItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/FineGrainedBehaviorItemProvider.java index c1bab07f73aabd62bd17a73a5316a2eed1ef384a..57eb2079004dbc8c38f29c0707b80ab648a57835 100644 --- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/FineGrainedBehaviorItemProvider.java +++ b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/FineGrainedBehaviorItemProvider.java @@ -7,16 +7,11 @@ package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider; import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.FineGrainedBehavior; import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorFactory; import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage; - import java.util.Collection; import java.util.List; - import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - -import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ForkActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ForkActionItemProvider.java index 365f04cd77f3416e68bdf7a80d259e6374801750..fa5700b8c714e3483a53933893089f64dccb3a85 100644 --- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ForkActionItemProvider.java +++ b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ForkActionItemProvider.java @@ -125,8 +125,10 @@ public class ForkActionItemProvider extends AbstractActionItemProvider { */ @Override public String getText(Object object) { - ForkAction forkAction = (ForkAction)object; - return getString("_UI_ForkAction_type") + " " + forkAction.isWithSynchronizationBarrier(); + String label = ((ForkAction)object).getName(); + return label == null || label.length() == 0 ? + getString("_UI_ForkAction_type") : + getString("_UI_ForkAction_type") + " " + label; } diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/InternalActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/InternalActionItemProvider.java index 1f122234ab36b93ae9eb76852cc972aaea579e04..5569a5a5b47b807d0aebc1fa0166f031f264ff50 100644 --- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/InternalActionItemProvider.java +++ b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/InternalActionItemProvider.java @@ -100,7 +100,10 @@ public class InternalActionItemProvider extends AbstractActionItemProvider { */ @Override public String getText(Object object) { - return getString("_UI_InternalAction_type"); + String label = ((InternalAction)object).getName(); + return label == null || label.length() == 0 ? + getString("_UI_InternalAction_type") : + getString("_UI_InternalAction_type") + " " + label; } diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/LoopActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/LoopActionItemProvider.java index 3dd1150f494de88e785757203e3b06af69bc83b9..0a3fc8d592b17c683c32108c248110afa44f5439 100644 --- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/LoopActionItemProvider.java +++ b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/LoopActionItemProvider.java @@ -101,7 +101,10 @@ public class LoopActionItemProvider extends AbstractActionItemProvider { */ @Override public String getText(Object object) { - return getString("_UI_LoopAction_type"); + String label = ((LoopAction)object).getName(); + return label == null || label.length() == 0 ? + getString("_UI_LoopAction_type") : + getString("_UI_LoopAction_type") + " " + label; } diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ReleaseActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ReleaseActionItemProvider.java index 5415e1dd195e066ad688c842b8ece81753f7ba67..651ff4508709832d84c432f511ad8118eddfe8f7 100644 --- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ReleaseActionItemProvider.java +++ b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ReleaseActionItemProvider.java @@ -4,6 +4,7 @@ package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider; +import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ReleaseAction; import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage; import java.util.Collection; @@ -89,7 +90,10 @@ public class ReleaseActionItemProvider extends AbstractActionItemProvider { */ @Override public String getText(Object object) { - return getString("_UI_ReleaseAction_type"); + String label = ((ReleaseAction)object).getName(); + return label == null || label.length() == 0 ? + getString("_UI_ReleaseAction_type") : + getString("_UI_ReleaseAction_type") + " " + label; } diff --git a/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/AbstractUserActionItemProvider.java b/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/AbstractUserActionItemProvider.java index 1d33d13fcbe28fde0c1a2f3179cc65a3117061c4..41b997ae29da825abaebf11e8b6e4695027e71d8 100644 --- a/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/AbstractUserActionItemProvider.java +++ b/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/AbstractUserActionItemProvider.java @@ -4,6 +4,8 @@ package edu.kit.ipd.descartes.mm.usageprofile.provider; +import edu.kit.ipd.descartes.core.provider.EntityItemProvider; +import edu.kit.ipd.descartes.mm.usageprofile.AbstractUserAction; import java.util.Collection; import java.util.List; @@ -27,13 +29,7 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter; * @generated */ public class AbstractUserActionItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { + extends EntityItemProvider { /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> @@ -67,7 +63,10 @@ public class AbstractUserActionItemProvider */ @Override public String getText(Object object) { - return getString("_UI_AbstractUserAction_type"); + String label = ((AbstractUserAction)object).getName(); + return label == null || label.length() == 0 ? + getString("_UI_AbstractUserAction_type") : + getString("_UI_AbstractUserAction_type") + " " + label; } diff --git a/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/BranchUserActionItemProvider.java b/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/BranchUserActionItemProvider.java index 3a06f42f3d07288c6e89f8e6dfbd82caca35c089..a5358c1cfde8a5760d32f068a2f41706764f8a59 100644 --- a/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/BranchUserActionItemProvider.java +++ b/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/BranchUserActionItemProvider.java @@ -103,7 +103,10 @@ public class BranchUserActionItemProvider extends AbstractUserActionItemProvider */ @Override public String getText(Object object) { - return getString("_UI_BranchUserAction_type"); + String label = ((BranchUserAction)object).getName(); + return label == null || label.length() == 0 ? + getString("_UI_BranchUserAction_type") : + getString("_UI_BranchUserAction_type") + " " + label; } diff --git a/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/DelayUserActionItemProvider.java b/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/DelayUserActionItemProvider.java index d4c658695f82f5f5028f3ce9b8520d9d77d02954..672309d1c0770fbf113199649d51ed18cbb77ca7 100644 --- a/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/DelayUserActionItemProvider.java +++ b/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/DelayUserActionItemProvider.java @@ -101,7 +101,10 @@ public class DelayUserActionItemProvider extends AbstractUserActionItemProvider */ @Override public String getText(Object object) { - return getString("_UI_DelayUserAction_type"); + String label = ((DelayUserAction)object).getName(); + return label == null || label.length() == 0 ? + getString("_UI_DelayUserAction_type") : + getString("_UI_DelayUserAction_type") + " " + label; } diff --git a/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/LoopUserActionItemProvider.java b/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/LoopUserActionItemProvider.java index 6c780ec6f58f2811f6cfb9bb61d42c62fe0f0f38..1f2dcbe4bdd5330c1cdb914ede2126411efb46c2 100644 --- a/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/LoopUserActionItemProvider.java +++ b/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/LoopUserActionItemProvider.java @@ -103,7 +103,10 @@ public class LoopUserActionItemProvider extends AbstractUserActionItemProvider { */ @Override public String getText(Object object) { - return getString("_UI_LoopUserAction_type"); + String label = ((LoopUserAction)object).getName(); + return label == null || label.length() == 0 ? + getString("_UI_LoopUserAction_type") : + getString("_UI_LoopUserAction_type") + " " + label; } diff --git a/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/SystemCallUserActionItemProvider.java b/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/SystemCallUserActionItemProvider.java index 0b3b1ae31b3b4ebb52bd9c0435fab6305f65e337..fe78a4c99f07b7b3061b7009a284fa09c6783bd0 100644 --- a/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/SystemCallUserActionItemProvider.java +++ b/edu.kit.ipd.descartes.mm.usageprofile.edit/src/edu/kit/ipd/descartes/mm/usageprofile/provider/SystemCallUserActionItemProvider.java @@ -147,7 +147,10 @@ public class SystemCallUserActionItemProvider extends AbstractUserActionItemProv */ @Override public String getText(Object object) { - return getString("_UI_SystemCallUserAction_type"); + String label = ((SystemCallUserAction)object).getName(); + return label == null || label.length() == 0 ? + getString("_UI_SystemCallUserAction_type") : + getString("_UI_SystemCallUserAction_type") + " " + label; }