From 18493bb1ab80d5784329b300a683c8430e3c0e01 Mon Sep 17 00:00:00 2001
From: Fabian Brosig <fabian.brosig@uni-wuerzburg.de>
Date: Fri, 26 Sep 2014 14:41:00 +0000
Subject: [PATCH] changed AbstractAction and AbstractUserAction to inherit from
core::Entity
git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/DMM/trunk@16463 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../provider/AbstractActionItemProvider.java | 25 ++++++-------------
.../provider/AcquireActionItemProvider.java | 6 ++++-
.../BlackBoxBehaviorItemProvider.java | 5 ----
.../provider/BranchActionItemProvider.java | 5 +++-
.../ExternalCallActionItemProvider.java | 5 +++-
.../FineGrainedBehaviorItemProvider.java | 5 ----
.../provider/ForkActionItemProvider.java | 6 +++--
.../provider/InternalActionItemProvider.java | 5 +++-
.../provider/LoopActionItemProvider.java | 5 +++-
.../provider/ReleaseActionItemProvider.java | 6 ++++-
.../AbstractUserActionItemProvider.java | 15 ++++++-----
.../BranchUserActionItemProvider.java | 5 +++-
.../provider/DelayUserActionItemProvider.java | 5 +++-
.../provider/LoopUserActionItemProvider.java | 5 +++-
.../SystemCallUserActionItemProvider.java | 5 +++-
15 files changed, 60 insertions(+), 48 deletions(-)
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 acd6541a..fa80eebb 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 d64d14db..4da59962 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 1637e228..568fd196 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 00b55571..695c92a4 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 c0cfc0ec..bcd9d391 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 c1bab07f..57eb2079 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 365f04cd..fa5700b8 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 1f122234..5569a5a5 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 3dd1150f..0a3fc8d5 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 5415e1dd..651ff450 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 1d33d13f..41b997ae 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 3a06f42f..a5358c1c 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 d4c65869..672309d1 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 6c780ec6..1f2dcbe4 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 0b3b1ae3..fe78a4c9 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;
}
--
GitLab