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

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

6 files changed, 79 insertions, 50 deletions

diff --git a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
index 8e653649e8..daea8bb4cd 100644
--- a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui;version="3.0.0";x-friends:="org.
  org.eclipse.emf.cdo.internal.ui.editor;version="3.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide",
  org.eclipse.emf.cdo.internal.ui.filters;version="3.0.0";x-internal:=true,
  org.eclipse.emf.cdo.internal.ui.messages;version="3.0.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.ui.perspectives;version="3.0.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.ui.perspectives;version="3.0.0";x-friends:="org.eclipse.emf.cdo.ui.ide",
  org.eclipse.emf.cdo.internal.ui.preferences;version="3.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide",
  org.eclipse.emf.cdo.internal.ui.properties;version="3.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide",
  org.eclipse.emf.cdo.internal.ui.views;version="3.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide",
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/AsyncContentProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/AsyncContentProvider.java
index f7b49136df..aebda96f39 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/AsyncContentProvider.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/AsyncContentProvider.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.internal.ui;
 
 import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.CDOState;
+import org.eclipse.emf.cdo.internal.ui.messages.Messages;
 
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
@@ -166,7 +167,7 @@ public class AsyncContentProvider implements ITreeContentProvider
     @Override
     public String toString()
     {
-      return "Pending...";
+      return Messages.getString("AsyncContentProvider_0"); //$NON-NLS-1$
     }
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java
index 3dc43a2301..1e5cae902d 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java
@@ -121,14 +121,14 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
    * @generated
    */
   protected IAction showPropertiesViewAction = new Action(PluginDelegator.INSTANCE
-      .getString("_UI_ShowPropertiesView_menu_item"))
+      .getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
   {
     @Override
     public void run()
     {
       try
       {
-        getPage().showView("org.eclipse.ui.views.PropertySheet");
+        getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
       }
       catch (PartInitException exception)
       {
@@ -143,7 +143,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
    * 
    * @generated
    */
-  protected IAction refreshViewerAction = new Action(PluginDelegator.INSTANCE.getString("_UI_RefreshViewer_menu_item"))
+  protected IAction refreshViewerAction = new Action(PluginDelegator.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
   {
     @Override
     public boolean isEnabled()
@@ -229,8 +229,8 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
   @Override
   public void contributeToToolBar(IToolBarManager toolBarManager)
   {
-    toolBarManager.add(new Separator("cdo-settings"));
-    toolBarManager.add(new Separator("cdo-additions"));
+    toolBarManager.add(new Separator("cdo-settings")); //$NON-NLS-1$
+    toolBarManager.add(new Separator("cdo-additions")); //$NON-NLS-1$
   }
 
   /**
@@ -244,23 +244,23 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
   {
     super.contributeToMenu(menuManager);
 
-    IMenuManager submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CDOEditor_menu"),
-        "org.eclipse.emf.cdo.internal.ui.editorMenuID");
-    menuManager.insertAfter("additions", submenuManager);
-    submenuManager.add(new Separator("settings"));
-    submenuManager.add(new Separator("actions"));
-    submenuManager.add(new Separator("additions"));
-    submenuManager.add(new Separator("additions-end"));
+    IMenuManager submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CDOEditor_menu"), //$NON-NLS-1$
+        "org.eclipse.emf.cdo.internal.ui.editorMenuID"); //$NON-NLS-1$
+    menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+    submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+    submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+    submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+    submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
 
     // Prepare for CreateChild item addition or removal.
     //
-    createChildMenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateChild_menu_item"));
-    submenuManager.insertBefore("additions", createChildMenuManager);
+    createChildMenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+    submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
 
     // Prepare for CreateSibling item addition or removal.
     //
-    createSiblingMenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateSibling_menu_item"));
-    submenuManager.insertBefore("additions", createSiblingMenuManager);
+    createSiblingMenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+    submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
 
     // Force an update because Eclipse hides empty menus now.
     //
@@ -559,13 +559,13 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
     super.menuAboutToShow(menuManager);
     MenuManager submenuManager = null;
 
-    submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateChild_menu_item"));
+    submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
     populateManager(submenuManager, createChildActions, null);
-    menuManager.insertBefore("edit", submenuManager);
+    menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
 
-    submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+    submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
     populateManager(submenuManager, createSiblingActions, null);
-    menuManager.insertBefore("edit", submenuManager);
+    menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
   }
 
   /**
@@ -575,11 +575,11 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
    */
   protected void addGlobalActionsGen(IMenuManager menuManager)
   {
-    menuManager.insertAfter("additions-end", new Separator("ui-actions"));
-    menuManager.insertAfter("ui-actions", showPropertiesViewAction);
+    menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+    menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
 
     refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
-    menuManager.insertAfter("ui-actions", refreshViewerAction);
+    menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
 
     super.addGlobalActions(menuManager);
   }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties
index 7e8992f511..6e3eba689c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties
@@ -16,6 +16,7 @@
 
 AbstractLockObjectsAction.0=Error
 AbstractLockObjectsAction.1=Cannot obtain locks
+AsyncContentProvider_0=Pending...
 BranchSelectionDialog_0=Change View Target
 BranchSelectionDialog_1=Please choose the target Branch
 BranchSelectionDialog_2=The selected branch point is current
@@ -63,6 +64,32 @@ CDOPreferencePage.7=EMF invalidation notifications:
 CDORemoteSessionsView_0=Message from {0}
 CDORemoteSessionsView_1=Message to {0}
 CDORemoteSessionsView_2=Message:
+CDOSessionPropertySource_0=ID
+CDOSessionPropertySource_10=Name
+CDOSessionPropertySource_11=The name of the repository of this session.
+CDOSessionPropertySource_12=UUID
+CDOSessionPropertySource_13=The UUID of the repository of this session.
+CDOSessionPropertySource_14=Type
+CDOSessionPropertySource_15=The type of the repository of this session. One of MASTER, BACKUP, CLONE.
+CDOSessionPropertySource_16=State
+CDOSessionPropertySource_17=The state of the repository of this session. One of OFFLINE, SYNCING, ONLINE.
+CDOSessionPropertySource_18=Creation Time
+CDOSessionPropertySource_19=The creation time of the repository of this session.
+CDOSessionPropertySource_20=Supporting Audits
+CDOSessionPropertySource_21=Whether the repository of this session is supporting auditing.
+CDOSessionPropertySource_22=Supporting Branches
+CDOSessionPropertySource_23=Whether the repository of this session is supporting branching.
+CDOSessionPropertySource_24=Store Type
+CDOSessionPropertySource_25=The type of the store that backs the repository of this session.
+CDOSessionPropertySource_26=Object ID Types
+CDOSessionPropertySource_27=The types of object IDs created by the store that backs the repository of this session.
+CDOSessionPropertySource_3=The ID of this session.
+CDOSessionPropertySource_4=User
+CDOSessionPropertySource_5=The ID of the authenticated user of this session.
+CDOSessionPropertySource_6=Passive Updates Enabled
+CDOSessionPropertySource_7=Whether this session is receiving passive updates from the repository.
+CDOSessionPropertySource_8=Passive Updates Mode
+CDOSessionPropertySource_9=One of INVALIDATIONS, CHANGES, ADDITIONS.
 CDOStateFilter.0=conflict
 CDOStateFilter.1=transient
 CDOStateFilter.2=new
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/properties/CDOSessionPropertySource.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/properties/CDOSessionPropertySource.java
index 824c0fa727..7411084c67 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/properties/CDOSessionPropertySource.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/properties/CDOSessionPropertySource.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.internal.ui.properties;
 
 import org.eclipse.emf.cdo.common.CDOCommonSession.Options.PassiveUpdateMode;
 import org.eclipse.emf.cdo.common.id.CDOID;
+import org.eclipse.emf.cdo.internal.ui.messages.Messages;
 import org.eclipse.emf.cdo.session.CDOSession;
 
 import java.util.Date;
@@ -21,9 +22,9 @@ import java.util.Date;
  */
 public class CDOSessionPropertySource extends CDOPropertySource<CDOSession>
 {
-  private static final String CATEGORY_SESSION = "Session";
+  private static final String CATEGORY_SESSION = "Session"; //$NON-NLS-1$
 
-  private static final String CATEGORY_REPOSITORY = "Repository";
+  private static final String CATEGORY_REPOSITORY = "Repository"; //$NON-NLS-1$
 
   private static final String SESSION_ID = "sessionID"; //$NON-NLS-1$
 
@@ -54,28 +55,28 @@ public class CDOSessionPropertySource extends CDOPropertySource<CDOSession>
   public CDOSessionPropertySource(CDOSession object)
   {
     super(object);
-    addPropertyDescriptor(CATEGORY_SESSION, SESSION_ID, "ID", "The ID of this session.");
-    addPropertyDescriptor(CATEGORY_SESSION, USER_ID, "User", "The ID of the authenticated user of this session.");
-    addPropertyDescriptor(CATEGORY_SESSION, PASSIVE_UPDATE_ENABLED, "Passive Updates Enabled",
-        "Whether this session is receiving passive updates from the repository.");
-    addPropertyDescriptor(CATEGORY_SESSION, PASSIVE_UPDATE_MODE, "Passive Updates Mode",
-        "One of INVALIDATIONS, CHANGES, ADDITIONS.");
-    addPropertyDescriptor(CATEGORY_REPOSITORY, REPOSITORY_NAME, "Name", "The name of the repository of this session.");
-    addPropertyDescriptor(CATEGORY_REPOSITORY, REPOSITORY_UUID, "UUID", "The UUID of the repository of this session.");
-    addPropertyDescriptor(CATEGORY_REPOSITORY, REPOSITORY_TYPE, "Type",
-        "The type of the repository of this session. One of MASTER, BACKUP, CLONE.");
-    addPropertyDescriptor(CATEGORY_REPOSITORY, REPOSITORY_STATE, "State",
-        "The state of the repository of this session. One of OFFLINE, SYNCING, ONLINE.");
-    addPropertyDescriptor(CATEGORY_REPOSITORY, REPOSITORY_CREATION_TIME, "Creation Time",
-        "The creation time of the repository of this session.");
-    addPropertyDescriptor(CATEGORY_REPOSITORY, SUPPORTING_AUDITS, "Supporting Audits",
-        "Whether the repository of this session is supporting auditing.");
-    addPropertyDescriptor(CATEGORY_REPOSITORY, SUPPORTING_BRANCHES, "Supporting Branches",
-        "Whether the repository of this session is supporting branching.");
-    addPropertyDescriptor(CATEGORY_REPOSITORY, STORE_TYPE, "Store Type",
-        "The type of the store that backs the repository of this session.");
-    addPropertyDescriptor(CATEGORY_REPOSITORY, OBJECT_ID_TYPES, "Object ID Types",
-        "The types of object IDs created by the store that backs the repository of this session.");
+    addPropertyDescriptor(CATEGORY_SESSION, SESSION_ID, Messages.getString("CDOSessionPropertySource_0"), Messages.getString("CDOSessionPropertySource_3")); //$NON-NLS-1$ //$NON-NLS-2$
+    addPropertyDescriptor(CATEGORY_SESSION, USER_ID, Messages.getString("CDOSessionPropertySource_4"), Messages.getString("CDOSessionPropertySource_5")); //$NON-NLS-1$ //$NON-NLS-2$
+    addPropertyDescriptor(CATEGORY_SESSION, PASSIVE_UPDATE_ENABLED, Messages.getString("CDOSessionPropertySource_6"), //$NON-NLS-1$
+        Messages.getString("CDOSessionPropertySource_7")); //$NON-NLS-1$
+    addPropertyDescriptor(CATEGORY_SESSION, PASSIVE_UPDATE_MODE, Messages.getString("CDOSessionPropertySource_8"), //$NON-NLS-1$
+        Messages.getString("CDOSessionPropertySource_9")); //$NON-NLS-1$
+    addPropertyDescriptor(CATEGORY_REPOSITORY, REPOSITORY_NAME, Messages.getString("CDOSessionPropertySource_10"), Messages.getString("CDOSessionPropertySource_11")); //$NON-NLS-1$ //$NON-NLS-2$
+    addPropertyDescriptor(CATEGORY_REPOSITORY, REPOSITORY_UUID, Messages.getString("CDOSessionPropertySource_12"), Messages.getString("CDOSessionPropertySource_13")); //$NON-NLS-1$ //$NON-NLS-2$
+    addPropertyDescriptor(CATEGORY_REPOSITORY, REPOSITORY_TYPE, Messages.getString("CDOSessionPropertySource_14"), //$NON-NLS-1$
+        Messages.getString("CDOSessionPropertySource_15")); //$NON-NLS-1$
+    addPropertyDescriptor(CATEGORY_REPOSITORY, REPOSITORY_STATE, Messages.getString("CDOSessionPropertySource_16"), //$NON-NLS-1$
+        Messages.getString("CDOSessionPropertySource_17")); //$NON-NLS-1$
+    addPropertyDescriptor(CATEGORY_REPOSITORY, REPOSITORY_CREATION_TIME, Messages.getString("CDOSessionPropertySource_18"), //$NON-NLS-1$
+        Messages.getString("CDOSessionPropertySource_19")); //$NON-NLS-1$
+    addPropertyDescriptor(CATEGORY_REPOSITORY, SUPPORTING_AUDITS, Messages.getString("CDOSessionPropertySource_20"), //$NON-NLS-1$
+        Messages.getString("CDOSessionPropertySource_21")); //$NON-NLS-1$
+    addPropertyDescriptor(CATEGORY_REPOSITORY, SUPPORTING_BRANCHES, Messages.getString("CDOSessionPropertySource_22"), //$NON-NLS-1$
+        Messages.getString("CDOSessionPropertySource_23")); //$NON-NLS-1$
+    addPropertyDescriptor(CATEGORY_REPOSITORY, STORE_TYPE, Messages.getString("CDOSessionPropertySource_24"), //$NON-NLS-1$
+        Messages.getString("CDOSessionPropertySource_25")); //$NON-NLS-1$
+    addPropertyDescriptor(CATEGORY_REPOSITORY, OBJECT_ID_TYPES, Messages.getString("CDOSessionPropertySource_26"), //$NON-NLS-1$
+        Messages.getString("CDOSessionPropertySource_27")); //$NON-NLS-1$
   }
 
   public Object getPropertyValue(Object id)
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java
index a03f933bf5..d02809cf9f 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java
@@ -43,7 +43,7 @@ public class CDOLabelDecorator implements ILabelDecorator
   public static final String[] DECORATION_PROPOSALS = { "${element}", "${id}", "${state}", "${created}", "${revised}" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
 
   public static final String DEFAULT_DECORATION = DECORATION_PROPOSALS[0]
-      + " [" + DECORATION_PROPOSALS[1] + ", " + DECORATION_PROPOSALS[2] + "]"; //$NON-NLS-1$ //$NON-NLS-2$
+      + " [" + DECORATION_PROPOSALS[1] + ", " + DECORATION_PROPOSALS[2] + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
   public static final String NO_DECORATION = DECORATION_PROPOSALS[0];