cleaned up naming mess

edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/DependencyRelationshipItemProvider.java

@@ -127,9 +127,7 @@ public class DependencyRelationshipItemProvider extends RelationshipItemProvider
 						dependencyRelationship, dependent.getInfluencedVariable());
 			if (dependent.getInfluencedVariable() != null) {
 				InfluencableModelVariable influencedVariable = dependent.getInfluencedVariable();
-				InfluencableModelVariableItemProvider provider = new InfluencableModelVariableItemProvider(
-						getAdapterFactory());
-				label += " " + provider.getSecondPartOfLabel(influencedVariable);
+				label += " " + influencedVariable.getName();
 			}
 		}
 		return label;

edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/InfluencableModelVariableItemProvider.java

@@ -100,23 +100,11 @@ public class InfluencableModelVariableItemProvider extends ModelVariableItemProv
 	@Override
 	public String getText(Object object) {
 		updateListeners(object);
-		return getSecondPartOfLabel(object);
-	}
-
-	public String getSecondPartOfLabel(Object object) {
-		if (object == null) 
-			return "";
 		String name = ((InfluencableModelVariable)object).getName();
-		ServiceBehaviorAbstraction behaviour = getParentBehaviour(object);
-		BasicComponent component = getParentComponent(object);
-		
-		String componentPartOfLabel = getComponentPartOfLabel(component);
-		String behaviourNamePartOfLabel = getBehaviourNamePartOfLabel(behaviour);
-		String behaviourTypePartOfLabel = getBehaviourTypePartOfLabel(behaviour);
-		String namePartOfLabel= getNamePartOfLabel(name);
-		
-		return concatLabelPieces(componentPartOfLabel, behaviourNamePartOfLabel,
-				behaviourTypePartOfLabel, namePartOfLabel);
+		if (name != null && !name.trim().isEmpty()) {
+			return name;
+		}
+		return "";
 	}
 	
 	private void updateListeners(Object object) {

edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/InfluencedVariableReferenceItemProvider.java

@@ -123,15 +123,13 @@ public class InfluencedVariableReferenceItemProvider
 	public String getText(Object object) {
 		InfluencedVariableReference ivr = (InfluencedVariableReference) object;
 		InfluencableModelVariable influencedVariable = ivr.getInfluencedVariable();
-		InfluencableModelVariableItemProvider provider = new InfluencableModelVariableItemProvider(
-				getAdapterFactory());
 		
 		if (influencedVariable != null)	
 			listenerComponent.tryToUpdateListeners(ivr, influencedVariable);
 		
-		String secondPartOfLabel = provider.getSecondPartOfLabel(influencedVariable);
 		
-		return getString("_UI_InfluencedVariableReference_type") + " " + secondPartOfLabel;
+		return getString("_UI_InfluencedVariableReference_type") 
+				+ " " + influencedVariable.getName();
 	}