- Fixed several issues described in the UI document

4 files changed, 34 insertions, 4 deletions

diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/plugin.properties b/plugins/org.eclipse.emf.cdo.ui.ide/plugin.properties
index c4e4d5ae1c..88138794df 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/plugin.properties
@@ -55,4 +55,4 @@ 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 = Change Target...
\ No newline at end of file
+action.label.14 = Switch to Another Branch or Version...
\ No newline at end of file
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 7f1d1ca997..1f9414d3ab 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
@@ -13,16 +13,21 @@ package org.eclipse.emf.cdo.ui.ide;
 
 import org.eclipse.emf.cdo.ui.internal.ide.bundle.OM;
 
+import org.eclipse.net4j.util.ui.UIUtil;
+
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.PartInitException;
 
 /**
  * @author Victor Roldan Betancort
  */
 public class CommonNavigatorUtils
 {
+  private static final String ERROR_LOG_ID = "org.eclipse.pde.runtime.LogView";
+
   public static Object createMessageProvider(final String message, final MessageType type)
   {
     return new IAdaptable()
@@ -57,7 +62,23 @@ public class CommonNavigatorUtils
             }
           };
         }
-
+        if (adapter.equals(Runnable.class))
+        {
+          return new Runnable()
+          {
+            public void run()
+            {
+              try
+              {
+                UIUtil.getActiveWorkbenchPage().showView(ERROR_LOG_ID);
+              }
+              catch (PartInitException ex)
+              {
+                OM.LOG.error(ex);
+              }
+            }
+          };
+        }
         return null;
       }
 
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 3bd39a6363..6326ed2148 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
@@ -53,6 +53,7 @@ import org.eclipse.emf.spi.cdo.InternalCDOObject;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
@@ -498,6 +499,14 @@ public class RepositoryContentProvider extends StructuredContentProvider<IWorksp
           OM.LOG.error(ex);
         }
       }
+      if (selection instanceof IAdaptable)
+      {
+        Runnable runnable = (Runnable)((IAdaptable)selection).getAdapter(Runnable.class);
+        if (runnable != null)
+        {
+          UIUtil.getDisplay().asyncExec(runnable);
+        }
+      }
     }
   }
 
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 56750b22b9..352ca6e17e 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
@@ -96,8 +96,8 @@ CDOWatchListView.7=Remove all subscriptions
 CDOWatchListView.8=Reset Changes
 CDOWatchListView.9=Reset all change notifications from the selected subscriptions
 ChangePassiveUpdateAction.1=Passive Updates
-ChangeViewTargetAction_0=Change Target
-ChangeViewTargetAction.0=Change the target CDOBranch of a CDOView
+ChangeViewTargetAction_0=Switch to Another Branch or Version
+ChangeViewTargetAction.0=Change the target CDOBranchPoint of a CDOView
 CloseSessionAction.0=Close
 CloseSessionAction.1=Close the CDO session
 CloseSessionAction.2=You have uncommitted changes. Do you want to discard them?