[272190] [UI] Externalize Strings (CDO)

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

11 files changed, 115 insertions, 26 deletions

diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/plugin.properties b/plugins/org.eclipse.emf.cdo.ui.ide/plugin.properties
index e944903517..0ef3580351 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/plugin.properties
@@ -23,3 +23,12 @@ providerName = Eclipse Modeling Project
 # %%% END OF TRANSLATED PROPERTIES %%%
 # The above properties have been shipped for translation.
 # ==============================================================================
+
+wizard.name = CDO
+navigatorContent.name = CDO Repository Content
+action.label = Disconnect
+action.label.0 = New CDOResource
+action.label.1 = New Folder
+action.label.2 = Remove
+action.label.3 = New CDOResource
+action.label.4 = New Folder
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/plugin.xml b/plugins/org.eclipse.emf.cdo.ui.ide/plugin.xml
index 74099aae76..28696764cb 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/plugin.xml
@@ -18,7 +18,7 @@
             class="org.eclipse.emf.cdo.ui.internal.ide.wizards.TeamConfigurationWizard"
             icon="icons/full/obj16/CDOResource.gif"
             id="org.eclipse.emf.cdo.ui.ide.TeamConfigurationWizard"
-            name="CDO">
+            name="%wizard.name">
       </wizard>
    </extension>
 
@@ -30,7 +30,7 @@
             icon="icons/full/obj16/repository_content.gif"
             id="org.eclipse.emf.cdo.ui.ide.RepositoryContent"
             labelProvider="org.eclipse.emf.cdo.ui.ide.RepositoryLabelProvider"
-            name="CDO Repository Content"
+            name="%navigatorContent.name"
             priority="normal"
             providesSaveables="false">
          <triggerPoints>
@@ -79,7 +79,7 @@
          <action
                class="org.eclipse.emf.cdo.ui.internal.ide.actions.DisconnectAction"
                id="org.eclipse.emf.cdo.ui.ide.DisconnectAction"
-               label="Disconnect"
+               label="%action.label"
                menubarPath="team.main/projectGroup">
          </action>
       </objectContribution>
@@ -91,13 +91,13 @@
                class="org.eclipse.emf.cdo.ui.internal.ide.actions.NewResourceAction"
                icon="icons/full/elcl16/NewCDOResource.gif"
                id="org.eclipse.emf.cdo.ui.ide.RemoveResourceAction"
-               label="New CDOResource">
+               label="%action.label.0">
          </action>
          <action
                class="org.eclipse.emf.cdo.ui.internal.ide.actions.NewResourceFolderAction"
                icon="icons/full/elcl16/NewCDOResourceFolder.gif"
                id="org.eclipse.emf.cdo.ui.ide.RemoveResourceAction"
-               label="New Folder">
+               label="%action.label.1">
          </action>
       </objectContribution>
       <objectContribution
@@ -108,7 +108,7 @@
                class="org.eclipse.emf.cdo.ui.internal.ide.actions.RemoveResourceAction"
                icon="icons/full/elcl16/delete_edit.gif"
                id="org.eclipse.emf.cdo.ui.ide.RemoveResourceAction"
-               label="Remove">
+               label="%action.label.2">
          </action>
       </objectContribution>
       <objectContribution
@@ -119,13 +119,13 @@
                class="org.eclipse.emf.cdo.ui.internal.ide.actions.NewResourceAction"
                icon="icons/full/elcl16/NewCDOResource.gif"
                id="org.eclipse.emf.cdo.ui.ide.RemoveResourceAction"
-               label="New CDOResource">
+               label="%action.label.3">
          </action>
          <action
                class="org.eclipse.emf.cdo.ui.internal.ide.actions.NewResourceFolderAction"
                icon="icons/full/elcl16/NewCDOResourceFolder.gif"
                id="org.eclipse.emf.cdo.ui.ide.RemoveResourceAction"
-               label="New Folder">
+               label="%action.label.4">
          </action>
       </objectContribution> </extension>
 
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/Node.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/Node.java
index 7ed3bb52bd..0c8518558d 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/Node.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/Node.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
 import org.eclipse.emf.cdo.eresource.CDOResourceNode;
 import org.eclipse.emf.cdo.team.IRepositoryProject;
 import org.eclipse.emf.cdo.ui.internal.ide.bundle.OM;
+import org.eclipse.emf.cdo.ui.internal.ide.messages.Messages;
 import org.eclipse.emf.cdo.view.CDOView;
 
 import org.eclipse.emf.ecore.EPackage;
@@ -81,13 +82,13 @@ public abstract class Node extends PlatformObject
     @Override
     public String getText()
     {
-      return "Sessions";
+      return Messages.getString("Node.0"); //$NON-NLS-1$
     }
 
     @Override
     public String getImageKey()
     {
-      return "icons/full/obj16/Sessions.gif";
+      return "icons/full/obj16/Sessions.gif"; //$NON-NLS-1$
     }
   }
 
@@ -110,13 +111,13 @@ public abstract class Node extends PlatformObject
     @Override
     public String getText()
     {
-      return "Packages";
+      return Messages.getString("Node.2"); //$NON-NLS-1$
     }
 
     @Override
     public String getImageKey()
     {
-      return "icons/full/obj16/Packages.gif";
+      return "icons/full/obj16/Packages.gif"; //$NON-NLS-1$
     }
 
     @Override
@@ -162,13 +163,13 @@ public abstract class Node extends PlatformObject
     @Override
     public String getText()
     {
-      return "Resources";
+      return Messages.getString("Node.4"); //$NON-NLS-1$
     }
 
     @Override
     public String getImageKey()
     {
-      return "icons/full/obj16/Resources.gif";
+      return "icons/full/obj16/Resources.gif"; //$NON-NLS-1$
     }
 
     @SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceAction.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceAction.java
index 7faf203cb5..0749c704c5 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceAction.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.ui.internal.ide.actions;
 
 import org.eclipse.emf.cdo.eresource.CDOResourceNode;
 import org.eclipse.emf.cdo.eresource.EresourceFactory;
+import org.eclipse.emf.cdo.ui.internal.ide.messages.Messages;
 
 /**
  * @author Eike Stepper
@@ -21,7 +22,7 @@ public class NewResourceAction extends NewResourceNodeAction
 {
   public NewResourceAction()
   {
-    super("Creating CDO resource");
+    super(Messages.getString("NewResourceAction_0")); //$NON-NLS-1$
   }
 
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceFolderAction.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceFolderAction.java
index c37be1015f..ca81441481 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceFolderAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceFolderAction.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.ui.internal.ide.actions;
 
 import org.eclipse.emf.cdo.eresource.CDOResourceNode;
 import org.eclipse.emf.cdo.eresource.EresourceFactory;
+import org.eclipse.emf.cdo.ui.internal.ide.messages.Messages;
 
 /**
  * @author Eike Stepper
@@ -21,7 +22,7 @@ public class NewResourceFolderAction extends NewResourceNodeAction
 {
   public NewResourceFolderAction()
   {
-    super("Creating CDO folder");
+    super(Messages.getString("NewResourceFolderAction_0")); //$NON-NLS-1$
   }
 
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceNodeAction.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceNodeAction.java
index 4ef548f570..772c336c9c 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceNodeAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceNodeAction.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
 import org.eclipse.emf.cdo.eresource.CDOResourceNode;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
+import org.eclipse.emf.cdo.ui.internal.ide.messages.Messages;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.dialogs.Dialog;
@@ -35,7 +36,7 @@ public abstract class NewResourceNodeAction extends TransactionalBackgroundActio
   @Override
   protected final CDOObject preRun(CDOObject object)
   {
-    InputDialog dialog = new InputDialog(getTargetPart().getSite().getShell(), getText(), "Enter the name", null, null);
+    InputDialog dialog = new InputDialog(getTargetPart().getSite().getShell(), getText(), Messages.getString("NewResourceNodeAction_0"), null, null); //$NON-NLS-1$
     if (dialog.open() == Dialog.OK)
     {
       newResourceNode = createNewResourceNode();
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/RemoveResourceAction.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/RemoveResourceAction.java
index 6ff7f321c6..bb8c00878d 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/RemoveResourceAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/RemoveResourceAction.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
 import org.eclipse.emf.cdo.eresource.CDOResourceNode;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 import org.eclipse.emf.cdo.ui.internal.ide.bundle.OM;
+import org.eclipse.emf.cdo.ui.internal.ide.messages.Messages;
 
 import org.eclipse.net4j.util.ui.UIUtil;
 
@@ -34,6 +35,7 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
 
+import java.text.MessageFormat;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -48,7 +50,7 @@ public class RemoveResourceAction implements IObjectActionDelegate
   private Shell shell;
 
   private static Image removeImage = OM.Activator.imageDescriptorFromPlugin(OM.BUNDLE_ID,
-      "icons/full/elcl16/delete_edit.gif").createImage();
+      "icons/full/elcl16/delete_edit.gif").createImage(); //$NON-NLS-1$
 
   public RemoveResourceAction()
   {
@@ -66,10 +68,10 @@ public class RemoveResourceAction implements IObjectActionDelegate
 
   public void run(IAction action)
   {
-    if (MessageDialog.openConfirm(shell, "Delete Resource", "Are you sure you want to delete the selected "
-        + nodes.size() + " item(s)?"))
+    if (MessageDialog.openConfirm(shell, Messages.getString("RemoveResourceAction_1"), MessageFormat.format( //$NON-NLS-1$
+        Messages.getString("RemoveResourceAction_2"), nodes.size()))) //$NON-NLS-1$
     {
-      Job job = new Job("Deleting CDOResource(s)")
+      Job job = new Job(Messages.getString("RemoveResourceAction_3")) //$NON-NLS-1$
       {
         @Override
         protected IStatus run(IProgressMonitor monitor)
@@ -110,7 +112,8 @@ public class RemoveResourceAction implements IObjectActionDelegate
             }
             catch (Exception ex)
             {
-              OM.LOG.error(this.getClass().getName().toString() + ": Cannot perform commit", ex);
+              OM.LOG
+                  .error(MessageFormat.format(Messages.getString("RemoveResourceAction_4"), this.getClass().getName().toString()), ex); //$NON-NLS-1$
             }
             finally
             {
@@ -118,7 +121,7 @@ public class RemoveResourceAction implements IObjectActionDelegate
             }
           }
 
-          UIUtil.setStatusBarMessage(nodes.size() + " element(s) removed", removeImage);
+          UIUtil.setStatusBarMessage(MessageFormat.format(Messages.getString("RemoveResourceAction_5"), nodes.size()), removeImage); //$NON-NLS-1$
           return Status.OK_STATUS;
         }
       };
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/TransactionalBackgroundAction.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/TransactionalBackgroundAction.java
index 5f21680da4..47d418e62b 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/TransactionalBackgroundAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/TransactionalBackgroundAction.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.ui.internal.ide.actions;
 
 import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
+import org.eclipse.emf.cdo.ui.internal.ide.messages.Messages;
 import org.eclipse.emf.cdo.view.CDOView;
 
 import org.eclipse.net4j.util.AdapterUtil;
@@ -25,6 +26,8 @@ import org.eclipse.jface.action.IAction;
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
 
+import java.text.MessageFormat;
+
 /**
  * @author Victor Roldan Betancort
  */
@@ -76,7 +79,7 @@ public abstract class TransactionalBackgroundAction extends LongRunningActionDel
         CDOView view = transactionalObject.cdoView();
         if (!(view instanceof CDOTransaction))
         {
-          throw new IllegalStateException("Object is not transactional: " + transactionalObject);
+          throw new IllegalStateException(MessageFormat.format(Messages.getString("TransactionalBackgroundAction_0"), transactionalObject)); //$NON-NLS-1$
         }
 
         // Bypass cancel()
@@ -108,7 +111,7 @@ public abstract class TransactionalBackgroundAction extends LongRunningActionDel
   {
     CDOTransaction transaction = (CDOTransaction)transactionalObject.cdoView();
     int commitWorkPercent = getCommitWorkPercent();
-    progressMonitor.beginTask("", 100);
+    progressMonitor.beginTask(Messages.getString("TransactionalBackgroundAction_1"), 100); //$NON-NLS-1$
 
     try
     {
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/messages/Messages.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/messages/Messages.java
new file mode 100644
index 0000000000..d3c4a2ce13
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/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.ui.internal.ide.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.ui.internal.ide.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.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/messages/messages.properties b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/messages/messages.properties
new file mode 100644
index 0000000000..bfd8c11530
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/messages/messages.properties
@@ -0,0 +1,16 @@
+NewResourceAction_0=Creating CDO resource
+NewResourceFolderAction_0=Creating CDO folder
+NewResourceNodeAction_0=Enter the name
+Node.0=Sessions
+Node.2=Packages
+Node.4=Resources
+RemoveResourceAction_1=Delete Resource
+RemoveResourceAction_2=Are you sure you want to delete the selected {0} item(s)?
+RemoveResourceAction_3=Deleting CDOResource(s)
+RemoveResourceAction_4={0}: Cannot perform commit
+RemoveResourceAction_5={0} element(s) removed
+TeamConfigurationWizard_1=Share Project to CDO
+TeamConfigurationWizard_2=Enter CDO repository location information
+TeamConfigurationWizard_3=Please provide a URL to the target server and a repository name
+TransactionalBackgroundAction_0=Object is not transactional: {0}
+TransactionalBackgroundAction_1=Commit Transaction
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/wizards/TeamConfigurationWizard.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/wizards/TeamConfigurationWizard.java
index f6987d128e..1f63ec1c34 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/wizards/TeamConfigurationWizard.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/wizards/TeamConfigurationWizard.java
@@ -14,6 +14,7 @@ package org.eclipse.emf.cdo.ui.internal.ide.wizards;
 import org.eclipse.emf.cdo.internal.team.RepositoryManager;
 import org.eclipse.emf.cdo.internal.team.RepositoryTeamProvider;
 import org.eclipse.emf.cdo.ui.internal.ide.bundle.OM;
+import org.eclipse.emf.cdo.ui.internal.ide.messages.Messages;
 import org.eclipse.emf.cdo.ui.widgets.SessionComposite;
 
 import org.eclipse.core.resources.IProject;
@@ -77,7 +78,7 @@ public class TeamConfigurationWizard extends Wizard implements IConfigurationWiz
 
     private Page1()
     {
-      super("page1");
+      super("page1"); //$NON-NLS-1$
     }
 
     public SessionComposite getSessionComposite()
@@ -89,6 +90,19 @@ public class TeamConfigurationWizard extends Wizard implements IConfigurationWiz
     {
       sessionComposite = new SessionComposite(parent, SWT.NONE);
       setControl(sessionComposite);
+      setWindowTitle(Messages.getString("TeamConfigurationWizard_1")); //$NON-NLS-1$
+    }
+
+    @Override
+    public String getTitle()
+    {
+      return Messages.getString("TeamConfigurationWizard_2"); //$NON-NLS-1$
+    }
+
+    @Override
+    public String getDescription()
+    {
+      return Messages.getString("TeamConfigurationWizard_3"); //$NON-NLS-1$
     }
   }
 }