[458349] Consolidate UI

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349

2 files changed, 70 insertions, 1 deletions

diff --git a/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF
index 2c98dc1c7c..357c90d91f 100644
--- a/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF
@@ -40,7 +40,8 @@ Export-Package: org.eclipse.emf.cdo;version="4.4.0",
    org.eclipse.emf.cdo.ui,
    org.eclipse.emf.cdo.ui.ide,
    org.eclipse.emf.cdo.explorer,
-   org.eclipse.emf.cdo.explorer.ui",
+   org.eclipse.emf.cdo.explorer.ui,
+   org.eclipse.emf.cdo.edit",
  org.eclipse.emf.internal.cdo.query;version="4.4.0";
   x-friends:="org.eclipse.emf.cdo.net4j,
    org.eclipse.emf.cdo.server,
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/ObjectProperties.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/ObjectProperties.java
index f7e875096f..60ff526f9c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/ObjectProperties.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/ObjectProperties.java
@@ -13,7 +13,9 @@ package org.eclipse.emf.internal.cdo.object;
 
 import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
+import org.eclipse.emf.cdo.common.id.CDOID;
 import org.eclipse.emf.cdo.common.lock.CDOLockState;
+import org.eclipse.emf.cdo.common.revision.CDORevision;
 import org.eclipse.emf.cdo.common.security.CDOPermission;
 import org.eclipse.emf.cdo.util.CDOUtil;
 import org.eclipse.emf.cdo.view.CDOView;
@@ -55,6 +57,50 @@ public class ObjectProperties extends Properties<EObject>
       }
     });
 
+    add(new Property<EObject>("version", //$NON-NLS-1$
+        "Version", "The version of this object.", CATEGORY_CDO)
+    {
+      @Override
+      protected Object eval(EObject object)
+      {
+        CDOObject cdoObject = CDOUtil.getCDOObject(object);
+        if (cdoObject == null)
+        {
+          return 0;
+        }
+
+        CDORevision revision = cdoObject.cdoRevision();
+        if (revision == null)
+        {
+          return 0;
+        }
+
+        return revision.getVersion();
+      }
+    });
+
+    add(new Property<EObject>("branch", //$NON-NLS-1$
+        "Branch", "The branch of this object.", CATEGORY_CDO)
+    {
+      @Override
+      protected Object eval(EObject object)
+      {
+        CDOObject cdoObject = CDOUtil.getCDOObject(object);
+        if (cdoObject == null)
+        {
+          return null;
+        }
+
+        CDORevision revision = cdoObject.cdoRevision();
+        if (revision == null)
+        {
+          return null;
+        }
+
+        return revision.getBranch().getPathName();
+      }
+    });
+
     add(new Property<EObject>("state", //$NON-NLS-1$
         "State", "The current state of this object.", CATEGORY_CDO)
     {
@@ -299,6 +345,28 @@ public class ObjectProperties extends Properties<EObject>
       }
     });
 
+    add(new Property<EObject>("uri", "URI", "The URI of this object.", CATEGORY_CDO) //$NON-NLS-1$
+    {
+      @Override
+      protected Object eval(EObject object)
+      {
+        CDOObject cdoObject = CDOUtil.getCDOObject(object);
+        if (cdoObject == null)
+        {
+          return null;
+        }
+
+        Resource resource = cdoObject.eResource();
+        if (resource == null)
+        {
+          return null;
+        }
+
+        CDOID id = cdoObject.cdoID();
+        String fragment = id != null ? id.toURIFragment() : resource.getURIFragment(cdoObject);
+        return resource.getURI().appendFragment(fragment).toString();
+      }
+    });
   }
 
   public static void main(String[] args)