Merging changes from R1_1_maintenance branch.

3 files changed, 15 insertions, 30 deletions

diff --git a/plugins/org.eclipse.uml2.codegen.ecore.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.codegen.ecore.ui/META-INF/MANIFEST.MF
index b8b152d13..e712f989d 100644
--- a/plugins/org.eclipse.uml2.codegen.ecore.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.codegen.ecore.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.codegen.ecore.ui; singleton:=true
-Bundle-Version: 1.1.0
+Bundle-Version: 2.0.0
 Bundle-ClassPath: uml2.codegen.ecore.ui.jar
 Bundle-Activator: org.eclipse.uml2.codegen.ecore.ui.CodeGenEcoreUIPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.uml2.codegen.ecore.ui/plugin.properties b/plugins/org.eclipse.uml2.codegen.ecore.ui/plugin.properties
index de99ce0dc..846565802 100644
--- a/plugins/org.eclipse.uml2.codegen.ecore.ui/plugin.properties
+++ b/plugins/org.eclipse.uml2.codegen.ecore.ui/plugin.properties
@@ -7,20 +7,15 @@
 # Contributors: 
 #   IBM - initial API and implementation
 #
-# $Id: plugin.properties,v 1.3 2005/06/09 02:34:44 khussey Exp $
+# $Id: plugin.properties,v 1.4 2005/08/31 15:26:27 khussey Exp $
 
 # NLS_MESSAGEFORMAT_VAR
 
 # ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
+# Do NOT change the properties between this line and the
+# "%%% END OF TRANSLATED PROPERTIES %%%" line.
+# Make a new property name, append to the end of the file and change
+# the code to use the new property.
 # ====================================================================
 
 pluginName = UML2 Ecore Code Generation UI
@@ -28,24 +23,10 @@ providerName = Eclipse.org
 
 _UI_PropertyDescriptor_description = The {0} of the {1}
 
-_UI_GenBase_type = Gen Base
-_UI_GenClass_type = Gen Class
-_UI_GenClassifier_type = Gen Classifier
-_UI_GenDataType_type = Gen Data Type
-_UI_GenEnum_type = Gen Enum
-_UI_GenEnumLiteral_type = Gen Enum Literal
-_UI_GenFeature_type = Gen Feature
-_UI_GenModel_type = GenModel
-_UI_GenOperation_type = Gen Operation
-_UI_GenPackage_type = Gen Package
-_UI_GenParameter_type = Gen Parameter
-_UI_GenTypedElement_type = Gen Typed Element
-_UI_Unknown_type = Object
-
 _UI_GenCacheAdapterScope_None_literal = None
 _UI_GenCacheAdapterScope_Global_literal = Global
 _UI_GenCacheAdapterScope_Resource_literal = Resource
-_UI_GenCacheAdapterScope_ResourceSet_literal = ResourceSet
+_UI_GenCacheAdapterScope_ResourceSet_literal = Resource Set
 
 _UI_Unknown_datatype= Value
 
@@ -68,5 +49,9 @@ _UI_GenOperation_cacheAdapterScope_feature = Cache Adapter Scope
 
 _UI_Unknown_feature = Unspecified
 
-
 _UI_UML2PropertyCategory = UML2
+
+# ====================================================================
+# %%% END OF TRANSLATED PROPERTIES %%%
+# The above properties have been shipped for translation.
+# ====================================================================
diff --git a/plugins/org.eclipse.uml2.codegen.ecore.ui/src/org/eclipse/uml2/codegen/ecore/genmodel/provider/GenTypedElementItemProvider.java b/plugins/org.eclipse.uml2.codegen.ecore.ui/src/org/eclipse/uml2/codegen/ecore/genmodel/provider/GenTypedElementItemProvider.java
index 0856201b2..8a4a9057e 100644
--- a/plugins/org.eclipse.uml2.codegen.ecore.ui/src/org/eclipse/uml2/codegen/ecore/genmodel/provider/GenTypedElementItemProvider.java
+++ b/plugins/org.eclipse.uml2.codegen.ecore.ui/src/org/eclipse/uml2/codegen/ecore/genmodel/provider/GenTypedElementItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *
- * $Id: GenTypedElementItemProvider.java,v 1.1 2005/05/25 21:24:23 khussey Exp $
+ * $Id: GenTypedElementItemProvider.java,v 1.2 2005/08/31 15:26:27 khussey Exp $
  */
 package org.eclipse.uml2.codegen.ecore.genmodel.provider;
 
@@ -75,10 +75,10 @@ public class GenTypedElementItemProvider
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	public String getText(Object object) {
-		return getString("_UI_GenTypedElement_type"); //$NON-NLS-1$
+		return super.getText(object);
 	}
 
 	/**