Hide "Disconnect" when CDORepository has sessionRefCount != 0 #18

eclipse-cdo · Aug 31, 2023 · e429c59 · e429c59
1 parent 4ccec33
commit e429c59
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml b/plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml
@@ -792,6 +792,7 @@
                      <and>
                         <instanceof value="org.eclipse.emf.cdo.explorer.repositories.CDORepository"/>
                         <test property="org.eclipse.emf.cdo.explorer.repository.state" value="Connected"/>
+                        <test property="org.eclipse.emf.cdo.explorer.repository.sessionRefs" value="0"/>
                      </and>
                   </iterate>
                </with>

diff --git a/plugins/org.eclipse.emf.cdo.explorer/plugin.xml b/plugins/org.eclipse.emf.cdo.explorer/plugin.xml
@@ -42,7 +42,7 @@
          id="org.eclipse.emf.cdo.explorer.repository.properties"
          type="org.eclipse.emf.cdo.explorer.repositories.CDORepository"
          namespace="org.eclipse.emf.cdo.explorer.repository"
-         properties="state,error,hasError,connected,type,id,label,folder,uri,authenticating,userID"
+         properties="state,error,hasError,sessionRefs,connected,type,id,label,folder,uri,authenticating,userID"
          class="org.eclipse.emf.cdo.internal.explorer.repositories.CDORepositoryProperties$Tester"/>
       <propertyTester
          id="org.eclipse.emf.cdo.explorer.checkout.properties"

diff --git a/...do.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java b/...do.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java
@@ -452,6 +452,11 @@ public void releaseSession()
     doDisconnect(false);
   }
 
+  public int getSessionRefCount()
+  {
+    return sessionRefCount;
+  }
+
   @Override
   public CDOTransaction openTransaction(CDOBranchPoint target, ResourceSet resourceSet)
   {

diff --git a/...lorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryProperties.java b/...lorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryProperties.java
@@ -60,6 +60,15 @@ protected Object eval(CDORepository repository)
       }
     });
 
+    add(new Property<CDORepository>("sessionRefs")
+    {
+      @Override
+      protected Object eval(CDORepository repository)
+      {
+        return ((CDORepositoryImpl)repository).getSessionRefCount();
+      }
+    });
+
     add(new Property<CDORepository>("connected", "Connected", "Whether this repository is connected", CATEGORY_REPOSITORY)
     {
       @Override