[416122] [UI] Move IDE-independent actions from cdo.ui.ide to cdo.ui

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

30 files changed, 175 insertions, 198 deletions

diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.ide/META-INF/MANIFEST.MF
index 98a40b68c5..de56a1c41c 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.ui.ide;singleton:=true
-Bundle-Version: 4.1.0.qualifier
+Bundle-Version: 4.1.100.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -16,8 +16,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.navigator;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
  org.eclipse.ui.navigator.resources;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.ui.ide;version="4.1.0",
- org.eclipse.emf.cdo.ui.internal.ide.actions;version="4.1.0";x-internal:=true,
- org.eclipse.emf.cdo.ui.internal.ide.bundle;version="4.1.0";x-internal:=true,
- org.eclipse.emf.cdo.ui.internal.ide.messages;version="4.1.0";x-internal:=true,
- org.eclipse.emf.cdo.ui.internal.ide.wizards;version="4.1.0";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.ui.ide;version="4.1.100",
+ org.eclipse.emf.cdo.ui.internal.ide.actions;version="4.1.100";x-internal:=true,
+ org.eclipse.emf.cdo.ui.internal.ide.bundle;version="4.1.100";x-internal:=true,
+ org.eclipse.emf.cdo.ui.internal.ide.messages;version="4.1.100";x-internal:=true,
+ org.eclipse.emf.cdo.ui.internal.ide.wizards;version="4.1.100";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/plugin.properties b/plugins/org.eclipse.emf.cdo.ui.ide/plugin.properties
index e2ca441692..c6897f7cd5 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/plugin.properties
@@ -12,37 +12,23 @@ providerName = Eclipse Modeling Project
 
 wizard.name = CDO
 navigatorContent.name = CDO Repository Content
+
 action.label = Disconnect
 action.label.0 = New Model Resource...
 action.label.1 = New Folder...
-action.label.2 = Remove
-action.label.3 = New Model Resource...
-action.label.4 = New Folder...
-action.label.15 = New Text Resource...
-action.label.16 = New Binary Resource...
+action.label.11 = New Branch...
+action.label.12 = Switch To
+action.label.14 = Switch to Another Branch or Version...
+action.label.5 = Show Package Registry...
+action.label.6 = Register Filesystem Packages...
+action.label.7 = Register Workspace Packages...
+action.label.8 = Import...
 action.tooltip = Creates a new resource in the selected container
 action.tooltip.0 = Creates a new folder in the selected container
-action.tooltip.1 = Removes the selected Node
-action.tooltip.2 = Creates a new resource in the selected container
-action.tooltip.3 = Creates a new folder in the selected container
-action.tooltip.12 = Creates a new text resource in the selected container
-action.tooltip.13 = Creates a new binary resource in the selected container
-action.label.5 = Show Package Registry...
+action.tooltip.10 = Switches the project to the selected branch
 action.tooltip.4 = Open the Package Manager...
-action.label.6 = Register Filesystem Packages...
 action.tooltip.5 = Register a model by browsing the file system
-action.label.7 = Register Workspace Packages...
 action.tooltip.6 = Register a model by browsing the workspace
-action.label.8 = Import...
 action.tooltip.7 = Imports an external resource into the repository root
-action.label.9 = Import...
-action.tooltip.8 = Imports an external resource into the selected folder
-action.label.10 = Export...
-action.label.11 = New Branch...
 action.tooltip.9 = Creates a new sub branch of the selected branch
-action.label.12 = Switch To
-action.tooltip.10 = Switches the project to the selected branch
 wizard.name.0 = CDO Project
-action.label.13 = Rename...
-action.tooltip.11 = Change the name of this resource node
-action.label.14 = Switch to Another Branch or Version...
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/plugin.xml b/plugins/org.eclipse.emf.cdo.ui.ide/plugin.xml
index 899bc8362e..6cbf743959 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/plugin.xml
@@ -89,91 +89,12 @@
             id="org.eclipse.emf.cdo.ui.ide.ResourcesNodeContributions"
             objectClass="org.eclipse.emf.cdo.ui.ide.Node$ResourcesNode">
          <action
-               class="org.eclipse.emf.cdo.ui.internal.ide.actions.ImportResourceActionDelegate"
-               icon="icons/full/elcl16/import_wiz.gif"
-               id="org.eclipse.emf.cdo.ui.ide.resourceNodeImportResource"
-               label="%action.label.8"
-               tooltip="%action.tooltip.7">
-         </action>
-         <action
-               class="org.eclipse.emf.cdo.ui.internal.ide.actions.NewResourceFolderActionDelegate"
-               icon="icons/full/elcl16/NewCDOResourceFolder.gif"
-               id="org.eclipse.emf.cdo.ui.ide.resourceNodeNewResourceFolderAction"
-               label="%action.label.1"
-               tooltip="%action.tooltip.0">
-         </action>
-         <action
-               class="org.eclipse.emf.cdo.ui.internal.ide.actions.NewResourceActionDelegate"
-               icon="icons/full/elcl16/NewCDOResource.gif"
-               id="org.eclipse.emf.cdo.ui.ide.resourceNodeCreateResourceAction"
-               label="%action.label.0"
-               tooltip="%action.tooltip">
-         </action>
-         <action
                class="org.eclipse.emf.cdo.ui.internal.ide.actions.ChangeViewTargetActionDelegate"
                id="org.eclipse.emf.cdo.ui.ide.changeViewTarget"
                label="%action.label.14">
          </action>
       </objectContribution>
       <objectContribution
-            adaptable="true"
-            id="org.eclipse.emf.cdo.ui.ide.CDOResourceNodeContributions"
-            objectClass="org.eclipse.emf.cdo.eresource.CDOResourceNode">
-         <action
-               class="org.eclipse.emf.cdo.ui.internal.ide.actions.RemoveResourceActionDelegate"
-               icon="icons/full/elcl16/delete_edit.gif"
-               id="org.eclipse.emf.cdo.ui.ide.removeResourceNodeAction"
-               label="%action.label.2"
-               tooltip="%action.tooltip.1">
-         </action>
-         <action
-               class="org.eclipse.emf.cdo.ui.internal.ide.actions.RenameResourceNodeActionDelegate"
-               id="org.eclipse.emf.cdo.ui.ide.renameResourceNodeAction"
-               label="%action.label.13"
-               tooltip="%action.tooltip.11">
-         </action>
-      </objectContribution>
-      <objectContribution
-            adaptable="true"
-            id="org.eclipse.emf.cdo.ui.ide.CDOResourceFolderContributions"
-            objectClass="org.eclipse.emf.cdo.eresource.CDOResourceFolder">
-         <action
-               class="org.eclipse.emf.cdo.ui.internal.ide.actions.ImportResourceActionDelegate"
-               icon="icons/full/elcl16/import_wiz.gif"
-               id="org.eclipse.emf.cdo.ui.ide.importResource"
-               label="%action.label.9"
-               tooltip="%action.tooltip.8">
-         </action>
-         <action
-               class="org.eclipse.emf.cdo.ui.internal.ide.actions.NewBinaryResourceActionDelegate"
-               icon="icons/full/elcl16/NewCDOBinaryResource.gif"
-               id="org.eclipse.emf.cdo.ui.ide.createBinaryResourceAction"
-               label="%action.label.16"
-               tooltip="%action.tooltip.13">
-         </action>
-         <action
-               class="org.eclipse.emf.cdo.ui.internal.ide.actions.NewTextResourceActionDelegate"
-               icon="icons/full/elcl16/NewCDOTextResource.gif"
-               id="org.eclipse.emf.cdo.ui.ide.createTextResourceAction"
-               label="%action.label.15"
-               tooltip="%action.tooltip.12">
-         </action>
-         <action
-               class="org.eclipse.emf.cdo.ui.internal.ide.actions.NewResourceActionDelegate"
-               icon="icons/full/elcl16/NewCDOResource.gif"
-               id="org.eclipse.emf.cdo.ui.ide.createResourceAction"
-               label="%action.label.3"
-               tooltip="%action.tooltip.2">
-         </action>
-         <action
-               class="org.eclipse.emf.cdo.ui.internal.ide.actions.NewResourceFolderActionDelegate"
-               icon="icons/full/elcl16/NewCDOResourceFolder.gif"
-               id="org.eclipse.emf.cdo.ui.ide.newResourceFolderAction"
-               label="%action.label.4"
-               tooltip="%action.tooltip.3">
-         </action>
-      </objectContribution>
-      <objectContribution
             adaptable="false"
             id="org.eclipse.emf.cdo.ui.ide.PackageNodeActions"
             objectClass="org.eclipse.emf.cdo.ui.ide.Node$PackagesNode">
@@ -201,17 +122,6 @@
       </objectContribution>
       <objectContribution
             adaptable="false"
-            id="org.eclipse.emf.cdo.ui.ide.CDOResourceActionContribution"
-            objectClass="org.eclipse.emf.cdo.eresource.CDOResource">
-         <action
-               class="org.eclipse.emf.cdo.ui.internal.ide.actions.ExportResourceActionDelegate"
-               icon="icons/full/elcl16/export_wiz.gif"
-               id="org.eclipse.emf.cdo.ui.ide.exportResource"
-               label="%action.label.10">
-         </action>
-      </objectContribution>
-      <objectContribution
-            adaptable="false"
             id="org.eclipse.emf.cdo.ui.ide.BranchesNodeActions"
             objectClass="org.eclipse.emf.cdo.ui.ide.Node$BranchNode">
          <action
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 d7ec808fcf..3212c79856 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
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.common.branch.CDOBranch;
 import org.eclipse.emf.cdo.common.branch.CDOBranchCreatedEvent;
 import org.eclipse.emf.cdo.eresource.CDOResource;
+import org.eclipse.emf.cdo.internal.ui.actions.RemoveResourceActionDelegate;
 import org.eclipse.emf.cdo.team.IRepositoryManager;
 import org.eclipse.emf.cdo.team.IRepositoryProject;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
@@ -27,7 +28,6 @@ import org.eclipse.emf.cdo.ui.ide.Node.BranchNode;
 import org.eclipse.emf.cdo.ui.ide.Node.PackagesNode;
 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;
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/ChangeViewTargetActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/ChangeViewTargetActionDelegate.java
index 2930043510..ffee011ccd 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/ChangeViewTargetActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/ChangeViewTargetActionDelegate.java
@@ -33,6 +33,7 @@ public class ChangeViewTargetActionDelegate extends ViewAwareActionDelegate
     {
       action = new SwitchTargetAction(getPage(), getView());
     }
+
     action.run();
   }
 }
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 2cf6e77b54..6047f48e6d 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
@@ -8,31 +8,13 @@
 #    Victor Roldan Betancort - initial API and implementation
 #    Eike Stepper - maintenance
 
-ExportSelectedResourceAction_0=Export Resource
-ImportResourceActionDelegate.0=Couldn't Import CDOResource
-ImportResourceToFolderAction_0=Import Resource
-ImportResourceToFolderAction_1=No URI has been introduced
-NewResourceAction_0=Creating CDO resource
-NewResourceFolderAction_0=Creating CDO folder
-NewTextResourceAction_0=Creating CDO text resource
-NewBinaryResourceAction_0=Creating CDO binary resource
-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
-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
-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.
@@ -45,14 +27,7 @@ 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
 RegisterWorkspacePackagesAction.0=Register Workspace Packages
 RegisterWorkspacePackagesAction.1=Register dynamic packages from the workspace
 PackageRegistryDialog.6=Workspace...
-OpenFileEditorAction.0=Open File Editor
-OpenFileEditorAction.1=Open a file editor for this resource
-OpenResourceEditorAction.0=Open Editor
-OpenResourceEditorAction.1=Open a model editor for this resource
 OpenResourcesDialog.0=Open Resources
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 ed65051e4e..077b0c097d 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
@@ -13,7 +13,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.internal.ui.perspectives.CDOExplorerPerspective;
+import org.eclipse.emf.cdo.internal.ui.perspectives.CDOPerspective;
 import org.eclipse.emf.cdo.ui.internal.ide.bundle.OM;
 import org.eclipse.emf.cdo.ui.internal.ide.messages.Messages;
 
@@ -85,7 +85,7 @@ public class CDOProjectCreationWizard extends Wizard implements IWorkbenchWizard
     }
 
     RepositoryManager.INSTANCE.addElement(newProject);
-    if (!CDOExplorerPerspective.isCurrent())
+    if (!CDOPerspective.isCurrent())
     {
       openCDOExplorerPerspective(workbench);
     }
@@ -219,7 +219,7 @@ public class CDOProjectCreationWizard extends Wizard implements IWorkbenchWizard
               Messages.getString("CDOProjectCreationWizard.6")); //$NON-NLS-1$
           if (result)
           {
-            workbench.showPerspective(CDOExplorerPerspective.ID, workbench.getActiveWorkbenchWindow());
+            workbench.showPerspective(CDOPerspective.ID, workbench.getActiveWorkbenchWindow());
           }
         }
         catch (WorkbenchException ex)
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 232325f898..655e7ef625 100644
--- a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
@@ -12,8 +12,8 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)";resolution:=optional;visibility:=reexport,
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.ui;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
+ org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.emf.edit.ui;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOBinaryResource.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/elcl16/NewCDOBinaryResource.gif
index f161cec785..f161cec785 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOBinaryResource.gif
+++ b/plugins/org.eclipse.emf.cdo.ui/icons/full/elcl16/NewCDOBinaryResource.gif
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOResource.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/elcl16/NewCDOResource.gif
index 2bd1c182c8..2bd1c182c8 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOResource.gif
+++ b/plugins/org.eclipse.emf.cdo.ui/icons/full/elcl16/NewCDOResource.gif
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOResourceFolder.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/elcl16/NewCDOResourceFolder.gif
index 6fb9345b2a..6fb9345b2a 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOResourceFolder.gif
+++ b/plugins/org.eclipse.emf.cdo.ui/icons/full/elcl16/NewCDOResourceFolder.gif
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOTextResource.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/elcl16/NewCDOTextResource.gif
index 53f8abe70c..53f8abe70c 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOTextResource.gif
+++ b/plugins/org.eclipse.emf.cdo.ui/icons/full/elcl16/NewCDOTextResource.gif
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/delete_edit.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/elcl16/delete_edit.gif
index b6922ac11c..b6922ac11c 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/delete_edit.gif
+++ b/plugins/org.eclipse.emf.cdo.ui/icons/full/elcl16/delete_edit.gif
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/export_wiz.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/elcl16/export_wiz.gif
index 5a0837d1e4..5a0837d1e4 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/export_wiz.gif
+++ b/plugins/org.eclipse.emf.cdo.ui/icons/full/elcl16/export_wiz.gif
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/import_wiz.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/elcl16/import_wiz.gif
index d38085ad9c..d38085ad9c 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/import_wiz.gif
+++ b/plugins/org.eclipse.emf.cdo.ui/icons/full/elcl16/import_wiz.gif
diff --git a/plugins/org.eclipse.emf.cdo.ui/plugin.properties b/plugins/org.eclipse.emf.cdo.ui/plugin.properties
index 7bbd98a05f..4324877a92 100644
--- a/plugins/org.eclipse.emf.cdo.ui/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.ui/plugin.properties
@@ -65,7 +65,7 @@ view.name.2 = CDO Remote Sessions
 editor.name.0 = CDO Editor
 page.name.0 = CDO
 page.name.1 = User Interface
-perspective.name = CDO Explorer
+perspective.name = CDO
 _UI_EditorEditorAdvisor_ActionSet_label = Editor Action Set
 _UI_Perspective_label = Editor
 
@@ -89,3 +89,27 @@ _UI_Menu_About_label = Editor &About...
 _UI_About_title = Editor Application
 _UI_About_text = Editor Application about box goes here.
 
+action.label.2 = Remove
+action.tooltip.1 = Removes the selected Node
+
+action.label.13 = Rename...
+action.tooltip.11 = Change the name of this resource node
+
+action.label.9 = Import...
+action.tooltip.8 = Imports an external resource into the selected folder
+
+action.label.16 = New Binary Resource...
+action.tooltip.13 = Creates a new binary resource in the selected container
+
+action.label.15 = New Text Resource...
+action.tooltip.12 = Creates a new text resource in the selected container
+
+action.label.3 = New Model Resource...
+action.tooltip.2 = Creates a new resource in the selected container
+
+action.label.4 = New Folder...
+action.tooltip.3 = Creates a new folder in the selected container
+
+action.label.10 = Export...
+action.tooltip.14 = Exports the selected resource
+
diff --git a/plugins/org.eclipse.emf.cdo.ui/plugin.xml b/plugins/org.eclipse.emf.cdo.ui/plugin.xml
index 1269d884ec..98fb4d3c70 100644
--- a/plugins/org.eclipse.emf.cdo.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.ui/plugin.xml
@@ -140,7 +140,7 @@
   <extension
         point="org.eclipse.ui.perspectives">
      <perspective
-           class="org.eclipse.emf.cdo.internal.ui.perspectives.CDOExplorerPerspective"
+           class="org.eclipse.emf.cdo.internal.ui.perspectives.CDOPerspective"
            icon="platform:/plugin/org.eclipse.emf.cdo.ui.shared/icons/full/view16/cdo_sessions.gif"
            id="org.eclipse.emf.cdo.ui.CDOExplorerPerspective"
            name="%perspective.name">
@@ -180,4 +180,78 @@
       </provider>
    </extension>
 
+   <extension
+         point="org.eclipse.ui.popupMenus">
+      <objectContribution
+            adaptable="true"
+            id="org.eclipse.emf.cdo.ui.CDOResourceNodeContributions"
+            objectClass="org.eclipse.emf.cdo.eresource.CDOResourceNode">
+         <action
+               class="org.eclipse.emf.cdo.internal.ui.actions.RemoveResourceActionDelegate"
+               icon="icons/full/elcl16/delete_edit.gif"
+               id="org.eclipse.emf.cdo.ui.RemoveResource"
+               label="%action.label.2"
+               tooltip="%action.tooltip.1">
+         </action>
+         <action
+               class="org.eclipse.emf.cdo.internal.ui.actions.RenameResourceActionDelegate"
+               id="org.eclipse.emf.cdo.ui.RenameResource"
+               label="%action.label.13"
+               tooltip="%action.tooltip.11">
+         </action>
+      </objectContribution>
+      <objectContribution
+            adaptable="true"
+            id="org.eclipse.emf.cdo.ui.CDOResourceFolderContributions"
+            objectClass="org.eclipse.emf.cdo.eresource.CDOResourceFolder">
+         <action
+               class="org.eclipse.emf.cdo.internal.ui.actions.ImportResourceActionDelegate"
+               icon="icons/full/elcl16/import_wiz.gif"
+               id="org.eclipse.emf.cdo.ui.ImportResource"
+               label="%action.label.9"
+               tooltip="%action.tooltip.8">
+         </action>
+         <action
+               class="org.eclipse.emf.cdo.internal.ui.actions.NewBinaryResourceActionDelegate"
+               icon="icons/full/elcl16/NewCDOBinaryResource.gif"
+               id="org.eclipse.emf.cdo.ui.NewBinaryResource"
+               label="%action.label.16"
+               tooltip="%action.tooltip.13">
+         </action>
+         <action
+               class="org.eclipse.emf.cdo.internal.ui.actions.NewTextResourceActionDelegate"
+               icon="icons/full/elcl16/NewCDOTextResource.gif"
+               id="org.eclipse.emf.cdo.ui.NewTextResource"
+               label="%action.label.15"
+               tooltip="%action.tooltip.12">
+         </action>
+         <action
+               class="org.eclipse.emf.cdo.internal.ui.actions.NewResourceActionDelegate"
+               icon="icons/full/elcl16/NewCDOResource.gif"
+               id="org.eclipse.emf.cdo.ui.NewResource"
+               label="%action.label.3"
+               tooltip="%action.tooltip.2">
+         </action>
+         <action
+               class="org.eclipse.emf.cdo.internal.ui.actions.NewResourceFolderActionDelegate"
+               icon="icons/full/elcl16/NewCDOResourceFolder.gif"
+               id="org.eclipse.emf.cdo.ui.NewResourceFolder"
+               label="%action.label.4"
+               tooltip="%action.tooltip.3">
+         </action>
+      </objectContribution>
+      <objectContribution
+            adaptable="false"
+            id="org.eclipse.emf.cdo.ui.CDOResourceActionContribution"
+            objectClass="org.eclipse.emf.cdo.eresource.CDOResource">
+         <action
+               class="org.eclipse.emf.cdo.internal.ui.actions.ExportResourceActionDelegate"
+               icon="icons/full/elcl16/export_wiz.gif"
+               id="org.eclipse.emf.cdo.ui.ExportResource"
+               label="%action.label.10"
+               tooltip="%action.tooltip.14">
+         </action>
+      </objectContribution>
+   </extension>
+
 </plugin>
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/ExportResourceActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceActionDelegate.java
index 6ae27945a3..4226773ecb 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/ExportResourceActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceActionDelegate.java
@@ -9,14 +9,14 @@
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
  */
-package org.eclipse.emf.cdo.ui.internal.ide.actions;
+package org.eclipse.emf.cdo.internal.ui.actions;
 
 import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.internal.ui.dialogs.ImportResourceDialog;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 import org.eclipse.emf.cdo.transaction.CDOTransactionCommentator;
-import org.eclipse.emf.cdo.ui.internal.ide.messages.Messages;
+import org.eclipse.emf.cdo.internal.ui.messages.Messages;
 
 import org.eclipse.net4j.util.io.IORuntimeException;
 
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/ImportResourceActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceActionDelegate.java
index 57fba84884..cb37fc4fcc 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/ImportResourceActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceActionDelegate.java
@@ -9,7 +9,7 @@
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
  */
-package org.eclipse.emf.cdo.ui.internal.ide.actions;
+package org.eclipse.emf.cdo.internal.ui.actions;
 
 import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.eresource.CDOResource;
@@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.eresource.CDOResourceNode;
 import org.eclipse.emf.cdo.internal.ui.dialogs.ImportResourceDialog;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 import org.eclipse.emf.cdo.transaction.CDOTransactionCommentator;
-import org.eclipse.emf.cdo.ui.internal.ide.messages.Messages;
+import org.eclipse.emf.cdo.internal.ui.messages.Messages;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.URI;
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewBinaryResourceActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewBinaryResourceActionDelegate.java
index 28bee56d6a..1b22ec19a8 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewBinaryResourceActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewBinaryResourceActionDelegate.java
@@ -9,11 +9,11 @@
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
  */
-package org.eclipse.emf.cdo.ui.internal.ide.actions;
+package org.eclipse.emf.cdo.internal.ui.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;
+import org.eclipse.emf.cdo.internal.ui.messages.Messages;
 
 /**
  * @author Eike Stepper
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewResourceActionDelegate.java
index a7b61ba098..d6bf5a933c 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewResourceActionDelegate.java
@@ -9,11 +9,11 @@
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
  */
-package org.eclipse.emf.cdo.ui.internal.ide.actions;
+package org.eclipse.emf.cdo.internal.ui.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;
+import org.eclipse.emf.cdo.internal.ui.messages.Messages;
 
 /**
  * @author Eike Stepper
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceFolderActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewResourceFolderActionDelegate.java
index 701308dde4..93566d2a1b 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceFolderActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewResourceFolderActionDelegate.java
@@ -9,11 +9,11 @@
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
  */
-package org.eclipse.emf.cdo.ui.internal.ide.actions;
+package org.eclipse.emf.cdo.internal.ui.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;
+import org.eclipse.emf.cdo.internal.ui.messages.Messages;
 
 /**
  * @author Eike Stepper
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceNodeActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewResourceNodeActionDelegate.java
index 6eacd68ca2..9a5fdae99f 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceNodeActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewResourceNodeActionDelegate.java
@@ -9,14 +9,13 @@
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
  */
-package org.eclipse.emf.cdo.ui.internal.ide.actions;
+package org.eclipse.emf.cdo.internal.ui.actions;
 
 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.internal.ui.actions.ResourceNodeNameInputValidator;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
-import org.eclipse.emf.cdo.ui.internal.ide.messages.Messages;
+import org.eclipse.emf.cdo.internal.ui.messages.Messages;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.dialogs.Dialog;
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewTextResourceActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewTextResourceActionDelegate.java
index 84ec6c9228..5f8a843cb7 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewTextResourceActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewTextResourceActionDelegate.java
@@ -9,11 +9,11 @@
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
  */
-package org.eclipse.emf.cdo.ui.internal.ide.actions;
+package org.eclipse.emf.cdo.internal.ui.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;
+import org.eclipse.emf.cdo.internal.ui.messages.Messages;
 
 /**
  * @author Eike Stepper
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/OpenResourceEditorAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java
index 8c61a3c927..a4fb38b8df 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/OpenResourceEditorAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java
@@ -9,16 +9,15 @@
  *    Eike Stepper - initial API and implementation
  *    Victor Roldan Betancort - maintenance
  */
-package org.eclipse.emf.cdo.ui.internal.ide.actions;
+package org.eclipse.emf.cdo.internal.ui.actions;
 
 import org.eclipse.emf.cdo.eresource.CDOFileResource;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.eresource.CDOResourceLeaf;
 import org.eclipse.emf.cdo.internal.ui.CDOLobEditorInput;
-import org.eclipse.emf.cdo.internal.ui.actions.ResourceNodeAction;
 import org.eclipse.emf.cdo.ui.CDOEditorUtil;
-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.internal.ui.bundle.OM;
+import org.eclipse.emf.cdo.internal.ui.messages.Messages;
 import org.eclipse.emf.cdo.view.CDOView;
 
 import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/RemoveResourceActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveResourceActionDelegate.java
index a184acd93b..1ba9baafed 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/RemoveResourceActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveResourceActionDelegate.java
@@ -9,7 +9,7 @@
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
  */
-package org.eclipse.emf.cdo.ui.internal.ide.actions;
+package org.eclipse.emf.cdo.internal.ui.actions;
 
 import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.eresource.CDOResource;
@@ -17,8 +17,8 @@ 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.transaction.CDOTransactionCommentator;
-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.internal.ui.bundle.OM;
+import org.eclipse.emf.cdo.internal.ui.messages.Messages;
 
 import org.eclipse.net4j.util.ui.UIUtil;
 
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/RenameResourceNodeActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RenameResourceActionDelegate.java
index 9cc4051357..1e44507720 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/RenameResourceNodeActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RenameResourceActionDelegate.java
@@ -9,13 +9,12 @@
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
  */
-package org.eclipse.emf.cdo.ui.internal.ide.actions;
+package org.eclipse.emf.cdo.internal.ui.actions;
 
 import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.eresource.CDOResourceNode;
-import org.eclipse.emf.cdo.internal.ui.actions.ResourceNodeNameInputValidator;
+import org.eclipse.emf.cdo.internal.ui.messages.Messages;
 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;
@@ -24,13 +23,13 @@ import org.eclipse.jface.dialogs.InputDialog;
 /**
  * @author Victor Roldan Betancort
  */
-public class RenameResourceNodeActionDelegate extends TransactionalBackgroundActionDelegate
+public class RenameResourceActionDelegate extends TransactionalBackgroundActionDelegate
 {
   private String newResourceName;
 
-  public RenameResourceNodeActionDelegate()
+  public RenameResourceActionDelegate()
   {
-    super(Messages.getString("RenameResourceNodeActionDelegate.0")); //$NON-NLS-1$
+    super(Messages.getString("RenameResourceActionDelegate.0")); //$NON-NLS-1$
   }
 
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/TransactionalBackgroundActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/TransactionalBackgroundActionDelegate.java
index 8d66ea7862..a2d5fddd07 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/TransactionalBackgroundActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/TransactionalBackgroundActionDelegate.java
@@ -9,12 +9,12 @@
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
  */
-package org.eclipse.emf.cdo.ui.internal.ide.actions;
+package org.eclipse.emf.cdo.internal.ui.actions;
 
 import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 import org.eclipse.emf.cdo.transaction.CDOTransactionCommentator;
-import org.eclipse.emf.cdo.ui.internal.ide.messages.Messages;
+import org.eclipse.emf.cdo.internal.ui.messages.Messages;
 import org.eclipse.emf.cdo.view.CDOView;
 
 import org.eclipse.net4j.util.AdapterUtil;
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 a0f77707a3..f33f853ec5 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
@@ -17,15 +17,9 @@
 AbstractLockObjectsAction.0=Error
 AbstractLockObjectsAction.1=Cannot obtain locks
 AsyncContentProvider_0=Pending...
-BranchSelectionDialog_0=Switch Target
-BranchSelectionDialog_1=Please choose the target branch
-BranchSelectionDialog_2=The selected branch point is current
-BranchSelectionDialog.0=Branch Point
 BranchSelectionDialog.1=Head
 BranchSelectionDialog.2=Base
 BranchSelectionDialog.3=Time
-BranchSelectionDialog.4=Commit Point
-BranchSelectionDialog.5=Cannot select base point for the main branch
 BulkAddDialog.0=Bulk Add
 BulkAddDialog.1=Select a child type and number of child instances
 BulkAddDialog.2=Type:
@@ -47,9 +41,6 @@ CDOInteractiveExceptionHandler.2=attempts
 CDOInteractiveExceptionHandler.3=A protocol problem occurred in {0} after {1} {2}.\n\nRetry or abort the operation?
 CDOInteractiveExceptionHandler.4=Retry
 CDOInteractiveExceptionHandler.5=Abort
-CDOItemProvider.0=Session {0} [{1}]
-CDOItemProvider.3=Transaction
-CDOItemProvider.7=View
 CDOItemProvider.8=Register Generated Package
 CDOPreferencePage.0=Session Defaults
 CDOPreferencePage.1=Repository name:
@@ -105,9 +96,6 @@ CloseViewAction.1=Close the CDO view
 CloseViewAction.2=You have uncommitted changes. Do you want to discard them?
 CommitTransactionAction.0=Commit
 CommitTransactionAction.1=Commit this transaction
-CreateResourceAction.2=Enter resource name:
-CreateResourceAction.4=Resource already exists
-CreateResourceAction.5=There already exists a resource with path "{0}". Do you want to edit the resource?
 
 Title.Folder=New Folder
 Tooltip.Folder=Create a new resource folder
@@ -201,5 +189,27 @@ SessionComposite.0=Server Description:
 SessionComposite.1=for example 'tcp://dev.eclipse.org:2036'
 SessionComposite.2=Repository Name:
 SessionComposite.3=Automatic Package Registry
-SessionComposite.4=Legacy Mode Default
 WriteLockObjectsAction.1=Write Lock
+ExportSelectedResourceAction_0=Export Resource
+ImportResourceActionDelegate.0=Couldn't Import CDOResource
+ImportResourceToFolderAction_0=Import Resource
+ImportResourceToFolderAction_1=No URI has been introduced
+NewResourceAction_0=Creating CDO resource
+NewResourceFolderAction_0=Creating CDO folder
+NewTextResourceAction_0=Creating CDO text resource
+NewBinaryResourceAction_0=Creating CDO binary resource
+NewResourceNodeAction_0=Enter the name
+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
+RenameResourceActionDelegate.0=Rename
+TransactionalBackgroundAction_0=Object is not transactional: {0}
+TransactionalBackgroundAction_1=Commit Transaction
+ExportResourceActionDelegate.0=Couldn't Export CDOResource
+ExportSelectedResourceAction_1=Export CDOResource
+ExportSelectedResourceAction_2=No URI has been introduced
+OpenFileEditorAction.0=Open File Editor
+OpenFileEditorAction.1=Open a file editor for this resource
+OpenResourceEditorAction.0=Open Editor
+OpenResourceEditorAction.1=Open a model editor for this resource
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOExplorerPerspective.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOPerspective.java
index 0e2013a2ad..de3b5a2e9b 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOExplorerPerspective.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOPerspective.java
@@ -23,13 +23,13 @@ import org.eclipse.ui.PlatformUI;
 /**
  * @author Victor Roldan Betancort
  */
-public class CDOExplorerPerspective implements IPerspectiveFactory
+public class CDOPerspective implements IPerspectiveFactory
 {
   public static final String ID = "org.eclipse.emf.cdo.ui.CDOExplorerPerspective"; //$NON-NLS-1$
 
   private IPageLayout pageLayout;
 
-  public CDOExplorerPerspective()
+  public CDOPerspective()
   {
   }
 
@@ -85,6 +85,6 @@ public class CDOExplorerPerspective implements IPerspectiveFactory
   static public boolean isCurrent()
   {
     return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getPerspective().getId()
-        .equals(CDOExplorerPerspective.ID);
+        .equals(CDOPerspective.ID);
   }
 }