[272190] [UI] Externalize Strings (CDO)

https://bugs.eclipse.org/bugs/show_bug.cgi?id=272190

8 files changed, 124 insertions, 90 deletions

diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java
index 45777a9a95..ae8ac4c4ef 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.CDOState;
 import org.eclipse.emf.cdo.common.id.CDOID;
 import org.eclipse.emf.cdo.common.revision.CDORevision;
+import org.eclipse.emf.cdo.edit.messages.Messages;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.view.CDOAdapterPolicy;
 import org.eclipse.emf.cdo.view.CDOView;
@@ -195,7 +196,7 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
     /**
      * PropertiesView category for CDO
      */
-    public static final String CDO_CATEGORY = "CDO";
+    public static final String CDO_CATEGORY = Messages.getString("CDOItemProviderAdapter.0"); //$NON-NLS-1$
 
     public CDOPropertyDescriptor()
     {
@@ -294,11 +295,11 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
    */
   public static class IDDescriptor extends CDOPropertyDescriptor implements IItemPropertyDescriptor
   {
-    private static final String FEATURE_ID = "ID";
+    private static final String FEATURE_ID = Messages.getString("CDOItemProviderAdapter.1"); //$NON-NLS-1$
 
-    private static final String DISPLAY_NAME = "ID";
+    private static final String DISPLAY_NAME = Messages.getString("CDOItemProviderAdapter.2"); //$NON-NLS-1$
 
-    private static final String DESCRIPTION = "The CDOID uniquely identifies this object in the repository";
+    private static final String DESCRIPTION = Messages.getString("CDOItemProviderAdapter.3"); //$NON-NLS-1$
 
     public IDDescriptor()
     {
@@ -338,11 +339,11 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
    */
   public static class VersionDescriptor extends CDOPropertyDescriptor implements IItemPropertyDescriptor
   {
-    private static final String FEATURE_ID = "Version";
+    private static final String FEATURE_ID = Messages.getString("CDOItemProviderAdapter.4"); //$NON-NLS-1$
 
-    private static final String DISPLAY_NAME = "Version";
+    private static final String DISPLAY_NAME = Messages.getString("CDOItemProviderAdapter.5"); //$NON-NLS-1$
 
-    private static final String DESCRIPTION = "The version of this object";
+    private static final String DESCRIPTION = Messages.getString("CDOItemProviderAdapter.6"); //$NON-NLS-1$
 
     public VersionDescriptor()
     {
@@ -405,11 +406,11 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
    */
   public static class StateDescriptor extends CDOPropertyDescriptor implements IItemPropertyDescriptor
   {
-    private static final String FEATURE_ID = "State";
+    private static final String FEATURE_ID = Messages.getString("CDOItemProviderAdapter.7"); //$NON-NLS-1$
 
-    private static final String DISPLAY_NAME = "State";
+    private static final String DISPLAY_NAME = Messages.getString("CDOItemProviderAdapter.8"); //$NON-NLS-1$
 
-    private static final String DESCRIPTION = "The local state of this object";
+    private static final String DESCRIPTION = Messages.getString("CDOItemProviderAdapter.9"); //$NON-NLS-1$
 
     public StateDescriptor()
     {
@@ -454,11 +455,11 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
    */
   public static class ViewDescriptor extends CDOPropertyDescriptor implements IItemPropertyDescriptor
   {
-    private static final String FEATURE_ID = "View";
+    private static final String FEATURE_ID = Messages.getString("CDOItemProviderAdapter.10"); //$NON-NLS-1$
 
-    private static final String DISPLAY_NAME = "View";
+    private static final String DISPLAY_NAME = Messages.getString("CDOItemProviderAdapter.11"); //$NON-NLS-1$
 
-    private static final String DESCRIPTION = "The view of this object";
+    private static final String DESCRIPTION = Messages.getString("CDOItemProviderAdapter.12"); //$NON-NLS-1$
 
     public ViewDescriptor()
     {
@@ -503,11 +504,11 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
    */
   public static class ContainerDescriptor extends CDOPropertyDescriptor implements IItemPropertyDescriptor
   {
-    private static final String FEATURE_ID = "Container";
+    private static final String FEATURE_ID = Messages.getString("CDOItemProviderAdapter.13"); //$NON-NLS-1$
 
-    private static final String DISPLAY_NAME = "Container";
+    private static final String DISPLAY_NAME = Messages.getString("CDOItemProviderAdapter.14"); //$NON-NLS-1$
 
-    private static final String DESCRIPTION = "The container of this object";
+    private static final String DESCRIPTION = Messages.getString("CDOItemProviderAdapter.15"); //$NON-NLS-1$
 
     private static AdapterFactory adapterFactory;
 
@@ -581,11 +582,11 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
    */
   public static class DirectResourceDescriptor extends CDOPropertyDescriptor implements IItemPropertyDescriptor
   {
-    private static final String FEATURE_ID = "DirectResource";
+    private static final String FEATURE_ID = Messages.getString("CDOItemProviderAdapter.16"); //$NON-NLS-1$
 
-    private static final String DISPLAY_NAME = "Direct Resource";
+    private static final String DISPLAY_NAME = Messages.getString("CDOItemProviderAdapter.17"); //$NON-NLS-1$
 
-    private static final String DESCRIPTION = "The direct resource of this object";
+    private static final String DESCRIPTION = Messages.getString("CDOItemProviderAdapter.18"); //$NON-NLS-1$
 
     public DirectResourceDescriptor()
     {
@@ -648,11 +649,11 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
    */
   public static class ReadLockedDescriptor extends CDOPropertyDescriptor implements IItemPropertyDescriptor
   {
-    private static final String FEATURE_ID = "ReadLocked";
+    private static final String FEATURE_ID = Messages.getString("CDOItemProviderAdapter.19"); //$NON-NLS-1$
 
-    private static final String DISPLAY_NAME = "Read Locked";
+    private static final String DISPLAY_NAME = Messages.getString("CDOItemProviderAdapter.20"); //$NON-NLS-1$
 
-    private static final String DESCRIPTION = "Shows if this object is read-locked";
+    private static final String DESCRIPTION = Messages.getString("CDOItemProviderAdapter.21"); //$NON-NLS-1$
 
     public ReadLockedDescriptor()
     {
@@ -715,11 +716,11 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
    */
   public static class WriteLockedDescriptor extends CDOPropertyDescriptor implements IItemPropertyDescriptor
   {
-    private static final String FEATURE_ID = "WriteLocked";
+    private static final String FEATURE_ID = Messages.getString("CDOItemProviderAdapter.22"); //$NON-NLS-1$
 
-    private static final String DISPLAY_NAME = "Write Locked";
+    private static final String DISPLAY_NAME = Messages.getString("CDOItemProviderAdapter.23"); //$NON-NLS-1$
 
-    private static final String DESCRIPTION = "Shows if this object is write-locked";
+    private static final String DESCRIPTION = Messages.getString("CDOItemProviderAdapter.24"); //$NON-NLS-1$
 
     public WriteLockedDescriptor()
     {
@@ -782,11 +783,11 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
    */
   public static class AdaptersDescriptor extends CDOPropertyDescriptor implements IItemPropertyDescriptor
   {
-    private static final String FEATURE_ID = "Adapters";
+    private static final String FEATURE_ID = Messages.getString("CDOItemProviderAdapter.25"); //$NON-NLS-1$
 
-    private static final String DISPLAY_NAME = "Adapters";
+    private static final String DISPLAY_NAME = Messages.getString("CDOItemProviderAdapter.26"); //$NON-NLS-1$
 
-    private static final String DESCRIPTION = "The list of adapters attached to this object";
+    private static final String DESCRIPTION = Messages.getString("CDOItemProviderAdapter.27"); //$NON-NLS-1$
 
     public AdaptersDescriptor()
     {
@@ -832,11 +833,11 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
   public static class ChangeSubscriptionPoliciesDescriptor extends CDOPropertyDescriptor implements
       IItemPropertyDescriptor
   {
-    private static final String FEATURE_ID = "ChangeSubscriptionPolicies";
+    private static final String FEATURE_ID = Messages.getString("CDOItemProviderAdapter.28"); //$NON-NLS-1$
 
-    private static final String DISPLAY_NAME = "Change Subscription Policies";
+    private static final String DISPLAY_NAME = Messages.getString("CDOItemProviderAdapter.29"); //$NON-NLS-1$
 
-    private static final String DESCRIPTION = "The change subscription policies associated with the underlying view of this object";
+    private static final String DESCRIPTION = Messages.getString("CDOItemProviderAdapter.30"); //$NON-NLS-1$
 
     public ChangeSubscriptionPoliciesDescriptor()
     {
@@ -891,7 +892,7 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
             for (CDOAdapterPolicy policy : policies)
             {
               builder.append(policy.toString());
-              builder.append(", ");
+              builder.append(", "); //$NON-NLS-1$
             }
 
             return builder.toString();
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/messages/Messages.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/messages/Messages.java
new file mode 100644
index 0000000000..b91644cf33
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/messages/Messages.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ */
+package org.eclipse.emf.cdo.edit.messages;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * @author Eike Stepper
+ */
+public class Messages
+{
+  private static final String BUNDLE_NAME = "org.eclipse.emf.cdo.edit.messages.messages"; //$NON-NLS-1$
+
+  private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+  private Messages()
+  {
+  }
+
+  public static String getString(String key)
+  {
+    try
+    {
+      return RESOURCE_BUNDLE.getString(key);
+    }
+    catch (MissingResourceException e)
+    {
+      return '!' + key + '!';
+    }
+  }
+}
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/messages/messages.properties b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/messages/messages.properties
new file mode 100644
index 0000000000..c23be8bf76
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/messages/messages.properties
@@ -0,0 +1,31 @@
+CDOItemProviderAdapter.0=CDO
+CDOItemProviderAdapter.1=ID
+CDOItemProviderAdapter.10=View
+CDOItemProviderAdapter.11=View
+CDOItemProviderAdapter.12=The view of this object
+CDOItemProviderAdapter.13=Container
+CDOItemProviderAdapter.14=Container
+CDOItemProviderAdapter.15=The container of this object
+CDOItemProviderAdapter.16=DirectResource
+CDOItemProviderAdapter.17=Direct Resource
+CDOItemProviderAdapter.18=The direct resource of this object
+CDOItemProviderAdapter.19=ReadLocked
+CDOItemProviderAdapter.2=ID
+CDOItemProviderAdapter.20=Read Locked
+CDOItemProviderAdapter.21=Shows if this object is read-locked
+CDOItemProviderAdapter.22=WriteLocked
+CDOItemProviderAdapter.23=Write Locked
+CDOItemProviderAdapter.24=Shows if this object is write-locked
+CDOItemProviderAdapter.25=Adapters
+CDOItemProviderAdapter.26=Adapters
+CDOItemProviderAdapter.27=The list of adapters attached to this object
+CDOItemProviderAdapter.28=ChangeSubscriptionPolicies
+CDOItemProviderAdapter.29=Change Subscription Policies
+CDOItemProviderAdapter.3=The CDOID uniquely identifies this object in the repository
+CDOItemProviderAdapter.30=The change subscription policies associated with the underlying view of this object
+CDOItemProviderAdapter.4=Version
+CDOItemProviderAdapter.5=Version
+CDOItemProviderAdapter.6=The version of this object
+CDOItemProviderAdapter.7=State
+CDOItemProviderAdapter.8=State
+CDOItemProviderAdapter.9=The local state of this object
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java
index 8f725bf448..da26970e7a 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java
@@ -39,13 +39,6 @@ public class CDOResourceFolderItemProvider extends CDOResourceNodeItemProvider i
     IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
-
-  /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
@@ -112,7 +105,7 @@ public class CDOResourceFolderItemProvider extends CDOResourceNodeItemProvider i
   @Override
   public Object getImage(Object object)
   {
-    return overlayImage(object, getResourceLocator().getImage("full/obj16/CDOResourceFolder"));
+    return overlayImage(object, getResourceLocator().getImage("full/obj16/CDOResourceFolder")); //$NON-NLS-1$
   }
 
   /**
@@ -124,7 +117,7 @@ public class CDOResourceFolderItemProvider extends CDOResourceNodeItemProvider i
   public String getText(Object object)
   {
     String label = ((CDOResourceFolder)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_CDOResourceFolder_type") + "?" : "/" + label;
+    return label == null || label.length() == 0 ? getString("_UI_CDOResourceFolder_type") + "?" : "/" + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java
index 5531cdf0b7..1aaa3aa912 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java
@@ -40,14 +40,6 @@ public class CDOResourceItemProvider extends CDOResourceNodeItemProvider impleme
     IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @since 2.0
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
-
-  /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
@@ -86,8 +78,8 @@ public class CDOResourceItemProvider extends CDOResourceNodeItemProvider impleme
   protected void addURIPropertyDescriptor(Object object)
   {
     itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
-        .getRootAdapterFactory(), getResourceLocator(), getString("_UI_CDOResource_uRI_feature"), getString(
-        "_UI_PropertyDescriptor_description", "_UI_CDOResource_uRI_feature", "_UI_CDOResource_type"),
+        .getRootAdapterFactory(), getResourceLocator(), getString("_UI_CDOResource_uRI_feature"), getString( //$NON-NLS-1$
+            "_UI_PropertyDescriptor_description", "_UI_CDOResource_uRI_feature", "_UI_CDOResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         EresourcePackage.Literals.CDO_RESOURCE__URI, false, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
         null, null));
   }
@@ -100,8 +92,8 @@ public class CDOResourceItemProvider extends CDOResourceNodeItemProvider impleme
   protected void addModifiedPropertyDescriptor(Object object)
   {
     itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
-        .getRootAdapterFactory(), getResourceLocator(), getString("_UI_CDOResource_modified_feature"), getString(
-        "_UI_PropertyDescriptor_description", "_UI_CDOResource_modified_feature", "_UI_CDOResource_type"),
+        .getRootAdapterFactory(), getResourceLocator(), getString("_UI_CDOResource_modified_feature"), getString( //$NON-NLS-1$
+            "_UI_PropertyDescriptor_description", "_UI_CDOResource_modified_feature", "_UI_CDOResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         EresourcePackage.Literals.CDO_RESOURCE__MODIFIED, false, false, false,
         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
@@ -114,8 +106,8 @@ public class CDOResourceItemProvider extends CDOResourceNodeItemProvider impleme
   protected void addLoadedPropertyDescriptor(Object object)
   {
     itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
-        .getRootAdapterFactory(), getResourceLocator(), getString("_UI_CDOResource_loaded_feature"), getString(
-        "_UI_PropertyDescriptor_description", "_UI_CDOResource_loaded_feature", "_UI_CDOResource_type"),
+        .getRootAdapterFactory(), getResourceLocator(), getString("_UI_CDOResource_loaded_feature"), getString( //$NON-NLS-1$
+            "_UI_PropertyDescriptor_description", "_UI_CDOResource_loaded_feature", "_UI_CDOResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         EresourcePackage.Literals.CDO_RESOURCE__LOADED, false, false, false,
         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
@@ -129,9 +121,9 @@ public class CDOResourceItemProvider extends CDOResourceNodeItemProvider impleme
   protected void addTrackingModificationPropertyDescriptor(Object object)
   {
     itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
-        .getRootAdapterFactory(), getResourceLocator(), getString("_UI_CDOResource_trackingModification_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_trackingModification_feature",
-            "_UI_CDOResource_type"), EresourcePackage.Literals.CDO_RESOURCE__TRACKING_MODIFICATION, true, false, false,
+        .getRootAdapterFactory(), getResourceLocator(), getString("_UI_CDOResource_trackingModification_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_trackingModification_feature", //$NON-NLS-1$ //$NON-NLS-2$
+            "_UI_CDOResource_type"), EresourcePackage.Literals.CDO_RESOURCE__TRACKING_MODIFICATION, true, false, false, //$NON-NLS-1$
         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
@@ -143,8 +135,8 @@ public class CDOResourceItemProvider extends CDOResourceNodeItemProvider impleme
   protected void addTimeStampPropertyDescriptor(Object object)
   {
     itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
-        .getRootAdapterFactory(), getResourceLocator(), getString("_UI_CDOResource_timeStamp_feature"), getString(
-        "_UI_PropertyDescriptor_description", "_UI_CDOResource_timeStamp_feature", "_UI_CDOResource_type"),
+        .getRootAdapterFactory(), getResourceLocator(), getString("_UI_CDOResource_timeStamp_feature"), getString( //$NON-NLS-1$
+            "_UI_PropertyDescriptor_description", "_UI_CDOResource_timeStamp_feature", "_UI_CDOResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         EresourcePackage.Literals.CDO_RESOURCE__TIME_STAMP, true, false, false,
         ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
@@ -190,7 +182,7 @@ public class CDOResourceItemProvider extends CDOResourceNodeItemProvider impleme
   @Override
   public Object getImage(Object object)
   {
-    return overlayImage(object, getResourceLocator().getImage("full/obj16/CDOResource"));
+    return overlayImage(object, getResourceLocator().getImage("full/obj16/CDOResource")); //$NON-NLS-1$
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java
index b0caaaceb5..727e5fac8b 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java
@@ -42,13 +42,6 @@ public class CDOResourceNodeItemProvider extends ItemProviderAdapter implements
     IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
-
-  /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
@@ -84,8 +77,8 @@ public class CDOResourceNodeItemProvider extends ItemProviderAdapter implements
   protected void addNamePropertyDescriptor(Object object)
   {
     itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
-        .getRootAdapterFactory(), getResourceLocator(), getString("_UI_CDOResourceNode_name_feature"), getString(
-        "_UI_PropertyDescriptor_description", "_UI_CDOResourceNode_name_feature", "_UI_CDOResourceNode_type"),
+        .getRootAdapterFactory(), getResourceLocator(), getString("_UI_CDOResourceNode_name_feature"), getString( //$NON-NLS-1$
+            "_UI_PropertyDescriptor_description", "_UI_CDOResourceNode_name_feature", "_UI_CDOResourceNode_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         EresourcePackage.Literals.CDO_RESOURCE_NODE__NAME, true, false, false,
         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
@@ -98,8 +91,8 @@ public class CDOResourceNodeItemProvider extends ItemProviderAdapter implements
   protected void addPathPropertyDescriptor(Object object)
   {
     itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
-        .getRootAdapterFactory(), getResourceLocator(), getString("_UI_CDOResourceNode_path_feature"), getString(
-        "_UI_PropertyDescriptor_description", "_UI_CDOResourceNode_path_feature", "_UI_CDOResourceNode_type"),
+        .getRootAdapterFactory(), getResourceLocator(), getString("_UI_CDOResourceNode_path_feature"), getString( //$NON-NLS-1$
+            "_UI_PropertyDescriptor_description", "_UI_CDOResourceNode_path_feature", "_UI_CDOResourceNode_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         EresourcePackage.Literals.CDO_RESOURCE_NODE__PATH, false, false, false,
         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
@@ -113,8 +106,8 @@ public class CDOResourceNodeItemProvider extends ItemProviderAdapter implements
   public String getText(Object object)
   {
     String label = ((CDOResourceNode)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_CDOResourceNode_type")
-        : getString("_UI_CDOResourceNode_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_CDOResourceNode_type") //$NON-NLS-1$
+        : getString("_UI_CDOResourceNode_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceEditPlugin.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceEditPlugin.java
index 0a6182b5fc..0cb8abbc7b 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceEditPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceEditPlugin.java
@@ -22,14 +22,6 @@ import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
 public final class EresourceEditPlugin extends EMFPlugin
 {
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @since 2.0
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
-
-  /**
    * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
index 1174bea5ed..719c51f7f1 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
@@ -48,14 +48,6 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
     IChangeNotifier, IDisposable, IChildCreationExtender
 {
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @since 2.0
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
-
-  /**
    * This keeps track of the root adapter factory that delegates to this adapter factory. <!-- begin-user-doc --> <!--
    * end-user-doc -->
    *