313178: Fix Internal API usage in org.eclipse.emf.cdo.ui

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

8 files changed, 36 insertions, 26 deletions

diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/CommonNavigatorUtils.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/CommonNavigatorUtils.java
index 1f9414d3ab..0b10368ee5 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/CommonNavigatorUtils.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/CommonNavigatorUtils.java
@@ -26,7 +26,7 @@ import org.eclipse.ui.PartInitException;
  */
 public class CommonNavigatorUtils
 {
-  private static final String ERROR_LOG_ID = "org.eclipse.pde.runtime.LogView";
+  private static final String ERROR_LOG_ID = "org.eclipse.pde.runtime.LogView"; //$NON-NLS-1$
 
   public static Object createMessageProvider(final String message, final MessageType type)
   {
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 d136cc7deb..896f263a0e 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
@@ -112,7 +112,7 @@ public abstract class Node extends PlatformObject
     {
       if (!getRepositoryProject().getView().getSession().getRepositoryInfo().isSupportingBranches())
       {
-        return CommonNavigatorUtils.createMessageProviderChild("Repository does not support branching",
+        return CommonNavigatorUtils.createMessageProviderChild(Messages.getString("Node.1"), //$NON-NLS-1$
             MessageType.INFO);
       }
 
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryContentProvider.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryContentProvider.java
index f65bf86283..d7ba987cd6 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryContentProvider.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryContentProvider.java
@@ -28,6 +28,7 @@ import org.eclipse.emf.cdo.ui.ide.Node.ResourcesNode;
 import org.eclipse.emf.cdo.ui.ide.Node.SessionsNode;
 import org.eclipse.emf.cdo.ui.internal.ide.actions.RemoveResourceActionDelegate;
 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.util.CDOUtil;
 import org.eclipse.emf.cdo.view.CDOView;
 import org.eclipse.emf.cdo.view.CDOViewInvalidationEvent;
@@ -165,7 +166,7 @@ public class RepositoryContentProvider extends StructuredContentProvider<IWorksp
     catch (Exception e)
     {
       OM.LOG.error(e);
-      return CommonNavigatorUtils.createMessageProviderChild("An error happened. See Error Log for more details.",
+      return CommonNavigatorUtils.createMessageProviderChild(Messages.getString("RepositoryContentProvider_0"), //$NON-NLS-1$
           MessageType.ERROR);
     }
   }
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/CreateBranchActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/CreateBranchActionDelegate.java
index f2c2a608f2..c1079c7a88 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/CreateBranchActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/CreateBranchActionDelegate.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.ui.internal.ide.actions;
 
 import org.eclipse.emf.cdo.common.branch.CDOBranch;
 import org.eclipse.emf.cdo.ui.ide.Node.BranchNode;
+import org.eclipse.emf.cdo.ui.internal.ide.messages.Messages;
 
 import org.eclipse.net4j.util.StringUtil;
 import org.eclipse.net4j.util.ui.UIUtil;
@@ -38,8 +39,8 @@ public class CreateBranchActionDelegate extends LongRunningActionDelegate
   @Override
   protected void preRun() throws Exception
   {
-    InputDialog dialog = new InputDialog(new Shell(), "Create a new branch",
-        "Please specify the name of the new branch", "", new BranchNameInputValidator());
+    InputDialog dialog = new InputDialog(new Shell(), Messages.getString("CreateBranchActionDelegate_0"), //$NON-NLS-1$
+        Messages.getString("CreateBranchActionDelegate_1"), "", new BranchNameInputValidator()); //$NON-NLS-1$ //$NON-NLS-2$
 
     if (dialog.open() == Dialog.OK)
     {
@@ -67,19 +68,19 @@ public class CreateBranchActionDelegate extends LongRunningActionDelegate
     {
       if (StringUtil.isEmpty(newText))
       {
-        return "Branch name cannot be empty";
+        return Messages.getString("CreateBranchActionDelegate_3"); //$NON-NLS-1$
       }
 
       if (newText.contains(CDOBranch.PATH_SEPARATOR))
       {
-        return "Branch name cannot contain path separators";
+        return Messages.getString("CreateBranchActionDelegate_4"); //$NON-NLS-1$
       }
 
       BranchNode branchNode = UIUtil.getElement(getSelection(), BranchNode.class);
       CDOBranch branch = branchNode.getBranch();
       if (branch.getBranch(newText) != null)
       {
-        return "A branch with that name already exists";
+        return Messages.getString("CreateBranchActionDelegate_5"); //$NON-NLS-1$
       }
 
       return null;
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
index e597aad568..95aca60f03 100644
--- 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
@@ -16,6 +16,7 @@ NewResourceAction_0=Creating CDO resource
 NewResourceFolderAction_0=Creating CDO folder
 NewResourceNodeAction_0=Enter the name
 Node.0=Sessions
+Node.1=Repository does not support branching
 Node.2=Packages
 Node.4=Resources
 RemoveResourceAction_1=Delete Resource
@@ -24,13 +25,24 @@ RemoveResourceAction_3=Deleting CDOResource(s)
 RemoveResourceAction_4={0}: Cannot perform commit
 RemoveResourceAction_5={0} element(s) removed
 RenameResourceNodeActionDelegate.0=Rename
+RepositoryContentProvider_0=An error happened. See Error Log for more details.
 TeamConfigurationWizard_1=Share Project to CDO
 TeamConfigurationWizard_2=Enter CDO repository location information
 TeamConfigurationWizard_3=Provide a URL to the target server and a repository name
 TransactionalBackgroundAction_0=Object is not transactional: {0}
 TransactionalBackgroundAction_1=Commit Transaction
+CDOProjectCreationWizard.0=New Project
+CDOProjectCreationWizard.1=Creation Problems
 CDOProjectCreationWizard.2=Create a new project resource.
 CDOProjectCreationWizard.4=Create and Share to CDO a new Project
+CDOProjectCreationWizard.5=Change perspective
+CDOProjectCreationWizard.6=Do you want to switch to CDO Explorer perspective?
+CDOShareProjectWizardPage_0=Please introduce a valid server URL and repository name
+CreateBranchActionDelegate_0=Create a new branch
+CreateBranchActionDelegate_1=Please specify the name of the new branch
+CreateBranchActionDelegate_3=Branch name cannot be empty
+CreateBranchActionDelegate_4=Branch name cannot contain path separators
+CreateBranchActionDelegate_5=A branch with that name already exists
 ExportResourceActionDelegate.0=Couldn't Export CDOResource
 ExportSelectedResourceAction_1=Export CDOResource
 ExportSelectedResourceAction_2=No URI has been introduced
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/wizards/CDOProjectCreationWizard.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/wizards/CDOProjectCreationWizard.java
index 148db61fda..bab046ae78 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/wizards/CDOProjectCreationWizard.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/wizards/CDOProjectCreationWizard.java
@@ -32,7 +32,6 @@ import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.team.core.TeamException;
 import org.eclipse.ui.IWorkbench;
@@ -41,9 +40,6 @@ import org.eclipse.ui.WorkbenchException;
 import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
 import org.eclipse.ui.ide.undo.CreateProjectOperation;
 import org.eclipse.ui.ide.undo.WorkspaceUndoUtil;
-import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
-import org.eclipse.ui.internal.ide.StatusUtil;
-import org.eclipse.ui.internal.wizards.newresource.ResourceMessages;
 import org.eclipse.ui.statushandlers.IStatusAdapterConstants;
 import org.eclipse.ui.statushandlers.StatusAdapter;
 import org.eclipse.ui.statushandlers.StatusManager;
@@ -54,7 +50,7 @@ import java.net.URI;
 /**
  * @author Victor Roldan Betancort
  */
-@SuppressWarnings("restriction")
+
 public class CDOProjectCreationWizard extends Wizard implements IWorkbenchWizard
 {
   private WizardNewProjectCreationPage projectCreationPage;
@@ -152,7 +148,8 @@ public class CDOProjectCreationWizard extends Wizard implements IWorkbenchWizard
     {
       public void run(IProgressMonitor monitor) throws InvocationTargetException
       {
-        CreateProjectOperation op = new CreateProjectOperation(description, ResourceMessages.NewProject_windowTitle);
+        CreateProjectOperation op = new CreateProjectOperation(description, Messages
+            .getString("CDOProjectCreationWizard.0")); //$NON-NLS-1$
         try
         {
           op.execute(monitor, WorkspaceUndoUtil.getUIInfoAdapter(getShell()));
@@ -183,23 +180,21 @@ public class CDOProjectCreationWizard extends Wizard implements IWorkbenchWizard
         StatusAdapter status;
         if (cause.getStatus().getCode() == IResourceStatus.CASE_VARIANT_EXISTS)
         {
-          status = new StatusAdapter(StatusUtil.newStatus(IStatus.WARNING, NLS.bind(
-              ResourceMessages.NewProject_caseVariantExistsError, newProjectHandle.getName()), cause));
+          status = new StatusAdapter(new Status(IStatus.WARNING, OM.BUNDLE_ID, cause.getMessage(), cause));
         }
         else
         {
-          status = new StatusAdapter(StatusUtil.newStatus(cause.getStatus().getSeverity(),
-              ResourceMessages.NewProject_errorMessage, cause));
+          status = new StatusAdapter(new Status(cause.getStatus().getSeverity(), OM.BUNDLE_ID, cause.getMessage(),
+              cause));
         }
 
-        status.setProperty(IStatusAdapterConstants.TITLE_PROPERTY, ResourceMessages.NewProject_errorMessage);
+        status.setProperty(IStatusAdapterConstants.TITLE_PROPERTY, Messages.getString("CDOProjectCreationWizard.1")); //$NON-NLS-1$
         StatusManager.getManager().handle(status, StatusManager.BLOCK);
       }
       else
       {
-        StatusAdapter status = new StatusAdapter(new Status(IStatus.WARNING, IDEWorkbenchPlugin.IDE_WORKBENCH, 0, NLS
-            .bind(ResourceMessages.NewProject_internalError, t.getMessage()), t));
-        status.setProperty(IStatusAdapterConstants.TITLE_PROPERTY, ResourceMessages.NewProject_errorMessage);
+        StatusAdapter status = new StatusAdapter(new Status(IStatus.WARNING, OM.BUNDLE_ID, t.getMessage(), t));
+        status.setProperty(IStatusAdapterConstants.TITLE_PROPERTY, Messages.getString("CDOProjectCreationWizard.1")); //$NON-NLS-1$
         StatusManager.getManager().handle(status, StatusManager.LOG | StatusManager.BLOCK);
       }
 
@@ -221,8 +216,8 @@ public class CDOProjectCreationWizard extends Wizard implements IWorkbenchWizard
       {
         try
         {
-          boolean result = MessageDialog.openQuestion(getShell(), "Change perspective",
-              "Do you want to switch to CDO Explorer perspective?");
+          boolean result = MessageDialog.openQuestion(getShell(), Messages.getString("CDOProjectCreationWizard.5"), //$NON-NLS-1$
+              Messages.getString("CDOProjectCreationWizard.6")); //$NON-NLS-1$
           if (result)
           {
             workbench.showPerspective(CDOExplorerPerspective.ID, workbench.getActiveWorkbenchWindow());
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/wizards/CDOShareProjectWizardPage.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/wizards/CDOShareProjectWizardPage.java
index b3bb724e1e..9cdfc56983 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/wizards/CDOShareProjectWizardPage.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/wizards/CDOShareProjectWizardPage.java
@@ -11,6 +11,7 @@
  */
 package org.eclipse.emf.cdo.ui.internal.ide.wizards;
 
+import org.eclipse.emf.cdo.ui.internal.ide.messages.Messages;
 import org.eclipse.emf.cdo.ui.widgets.SessionComposite;
 
 import org.eclipse.jface.wizard.WizardPage;
@@ -71,7 +72,7 @@ public class CDOShareProjectWizardPage extends WizardPage
       return true;
     }
 
-    CDOShareProjectWizardPage.this.setErrorMessage("Please introduce a valid server URL and repository name");
+    CDOShareProjectWizardPage.this.setErrorMessage(Messages.getString("CDOShareProjectWizardPage_0")); //$NON-NLS-1$
     return false;
   }
 }
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 2c31873c53..2cd8e56209 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
@@ -47,7 +47,7 @@ public class TeamConfigurationWizard extends Wizard implements IConfigurationWiz
   @Override
   public void addPages()
   {
-    page1 = new CDOShareProjectWizardPage("page1");
+    page1 = new CDOShareProjectWizardPage("page1"); //$NON-NLS-1$
     page1.setTitle(Messages.getString("TeamConfigurationWizard_2")); //$NON-NLS-1$    
     addPage(page1);
   }