*** empty log message ***

5 files changed, 33 insertions, 7 deletions

diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java
index 90a541a5e5..cb9c106117 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java
@@ -53,7 +53,7 @@ public abstract class ItemsProcessor
         {
           try
           {
-            processCDOObject(viewer, ids, viewer.getInput());
+            processObject(viewer, ids, viewer.getInput());
             processItems(viewer, ids, viewer.getTree().getItems());
           }
           catch (Exception ex)
@@ -76,7 +76,7 @@ public abstract class ItemsProcessor
       return (CDOObject)object;
     }
 
-    if (view != null)
+    if (object != null && view != null)
     {
       return FSMUtil.adapt(object, view);
     }
@@ -91,7 +91,7 @@ public abstract class ItemsProcessor
     for (TreeItem item : items)
     {
       Object object = item.getData();
-      processCDOObject(viewer, ids, object);
+      processObject(viewer, ids, object);
       if (item.getItemCount() != 0)
       {
         processItems(viewer, ids, item.getItems());
@@ -99,7 +99,7 @@ public abstract class ItemsProcessor
     }
   }
 
-  private void processCDOObject(TreeViewer viewer, Set<CDOID> ids, Object object)
+  private void processObject(TreeViewer viewer, Set<CDOID> ids, Object object)
   {
     CDOObject cdoObject = getCDOObject(object);
     if (cdoObject != null)
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractOpenViewAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractOpenViewAction.java
new file mode 100644
index 0000000000..9203ad8d50
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractOpenViewAction.java
@@ -0,0 +1,26 @@
+package org.eclipse.emf.cdo.internal.ui.actions;
+
+import org.eclipse.emf.cdo.CDOSession;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.IWorkbenchPage;
+
+/**
+ * @author Eike Stepper
+ */
+public abstract class AbstractOpenViewAction extends SessionAction
+{
+  private static final int NUMBER_OF_SYSTEM_PACKAGES = 2;
+
+  public AbstractOpenViewAction(IWorkbenchPage page, String text, String toolTipText, ImageDescriptor image,
+      CDOSession session)
+  {
+    super(page, text, toolTipText, image, session);
+  }
+
+  @Override
+  public boolean isEnabled()
+  {
+    return getSession().getPackageRegistry().size() > NUMBER_OF_SYSTEM_PACKAGES && super.isEnabled();
+  }
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenAuditAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenAuditAction.java
index d19a7d8f45..2cc49d9985 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenAuditAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenAuditAction.java
@@ -11,7 +11,7 @@ import org.eclipse.ui.IWorkbenchPage;
 /**
  * @author Eike Stepper
  */
-public final class OpenAuditAction extends SessionAction
+public final class OpenAuditAction extends AbstractOpenViewAction
 {
   public OpenAuditAction(IWorkbenchPage page, CDOSession session)
   {
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java
index aa54d72e90..8f7eed78b1 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java
@@ -11,7 +11,7 @@ import org.eclipse.ui.IWorkbenchPage;
 /**
  * @author Eike Stepper
  */
-public final class OpenTransactionAction extends SessionAction
+public final class OpenTransactionAction extends AbstractOpenViewAction
 {
   public OpenTransactionAction(IWorkbenchPage page, CDOSession session)
   {
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewAction.java
index a199457f5b..d3d6c89938 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewAction.java
@@ -11,7 +11,7 @@ import org.eclipse.ui.IWorkbenchPage;
 /**
  * @author Eike Stepper
  */
-public final class OpenViewAction extends SessionAction
+public final class OpenViewAction extends AbstractOpenViewAction
 {
   public OpenViewAction(IWorkbenchPage page, CDOSession session)
   {