[80318] Correcting item providers.
diff --git a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ComponentItemProvider.java b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ComponentItemProvider.java
index 79fd8fb..3946cb9 100644
--- a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ComponentItemProvider.java
+++ b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ComponentItemProvider.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ComponentItemProvider.java,v 1.8 2006/02/21 21:40:13 khussey Exp $
+ * $Id: ComponentItemProvider.java,v 1.9 2006/02/24 17:28:06 khussey Exp $
*/
package org.eclipse.uml2.uml.edit.providers;
@@ -221,13 +221,12 @@
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated NOT
*/
public String getText(Object object) {
- String label = ((Component) object).getName();
- return label == null || label.length() == 0
- ? getString("_UI_Component_type") : //$NON-NLS-1$
- getString("_UI_Component_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ return appendLabel(
+ appendType(appendKeywords(new StringBuffer(), object),
+ "_UI_Component_type"), object).toString(); //$NON-NLS-1$
}
/**
diff --git a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ImageItemProvider.java b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ImageItemProvider.java
index 4d0cd1b..0c1a061 100644
--- a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ImageItemProvider.java
+++ b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ImageItemProvider.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ImageItemProvider.java,v 1.6 2006/01/24 22:46:32 khussey Exp $
+ * $Id: ImageItemProvider.java,v 1.7 2006/02/24 17:28:06 khussey Exp $
*/
package org.eclipse.uml2.uml.edit.providers;
@@ -148,8 +148,9 @@
* @generated NOT
*/
public String getText(Object object) {
- return appendType(appendKeywords(new StringBuffer(), object),
- "_UI_Image_type").toString(); //$NON-NLS-1$
+ return appendString(
+ appendType(appendKeywords(new StringBuffer(), object),
+ "_UI_Image_type"), ((Image) object).getLocation()).toString(); //$NON-NLS-1$
}
/**
diff --git a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ProtocolTransitionItemProvider.java b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ProtocolTransitionItemProvider.java
index 25298b5..0d41e95 100644
--- a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ProtocolTransitionItemProvider.java
+++ b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ProtocolTransitionItemProvider.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ProtocolTransitionItemProvider.java,v 1.7 2006/01/24 22:46:32 khussey Exp $
+ * $Id: ProtocolTransitionItemProvider.java,v 1.8 2006/02/24 17:28:06 khussey Exp $
*/
package org.eclipse.uml2.uml.edit.providers;
@@ -179,7 +179,7 @@
public String getText(Object object) {
return appendLabel(
appendType(appendKeywords(new StringBuffer(), object),
- "_UI_Transition_type"), object).toString(); //$NON-NLS-1$
+ "_UI_ProtocolTransition_type"), object).toString(); //$NON-NLS-1$
}
/**
