Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-03-18 07:47:48 +0000
committerEike Stepper2015-03-18 11:46:36 +0000
commit4db261fcbf7ea2e0911472eea0930fb326ef255c (patch)
tree9406dbf6094133602a4b1fcdc4f0abb98e4ff7f3 /plugins/org.eclipse.emf.cdo.explorer
parent468612c95d76d4f355fdd05eebea6e346a3b665d (diff)
downloadcdo-4db261fcbf7ea2e0911472eea0930fb326ef255c.tar.gz
cdo-4db261fcbf7ea2e0911472eea0930fb326ef255c.tar.xz
cdo-4db261fcbf7ea2e0911472eea0930fb326ef255c.zip
[458349] Consolidate UI
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.explorer')
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/checkouts/CDOCheckout.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java42
3 files changed, 24 insertions, 24 deletions
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/checkouts/CDOCheckout.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/checkouts/CDOCheckout.java
index f4ced13ce4..8ca4983bdd 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/checkouts/CDOCheckout.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/checkouts/CDOCheckout.java
@@ -35,7 +35,9 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
*/
public interface CDOCheckout extends CDOExplorerElement, CDOTimeProvider, StateProvider
{
- public static final String TYPE_ONLINE = "online";
+ public static final String TYPE_ONLINE_TRANSACTIONAL = "online-transactional";
+
+ public static final String TYPE_ONLINE_HISTORICAL = "online-historical";
public static final String TYPE_OFFLINE = "offline";
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java
index 586e1606fe..4f337e4e01 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java
@@ -81,7 +81,7 @@ public class CDOCheckoutManagerImpl extends AbstractManager<CDOCheckout> impleme
@Override
protected CDOCheckout createElement(String type)
{
- if (CDOCheckout.TYPE_ONLINE.equals(type))
+ if (CDOCheckout.TYPE_ONLINE_TRANSACTIONAL.equals(type))
{
return new OnlineCDOCheckout();
}
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java
index 00c5e1d733..92515305f1 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java
@@ -437,34 +437,32 @@ public abstract class CDORepositoryImpl extends AbstractElement implements CDORe
};
}
}
+ }
- if (adapter == CDORepositoryElement.class)
+ if (adapter == CDORepositoryElement.class)
+ {
+ return new CDORepositoryElement()
{
- final CDOID objectID = session.getRepositoryInfo().getRootResourceID();
-
- return new CDORepositoryElement()
+ public CDORepository getRepository()
{
- public CDORepository getRepository()
- {
- return CDORepositoryImpl.this;
- }
+ return CDORepositoryImpl.this;
+ }
- public int getBranchID()
- {
- return CDOBranch.MAIN_BRANCH_ID;
- }
+ public int getBranchID()
+ {
+ return CDOBranch.MAIN_BRANCH_ID;
+ }
- public long getTimeStamp()
- {
- return CDOBranchPoint.UNSPECIFIED_DATE;
- }
+ public long getTimeStamp()
+ {
+ return CDOBranchPoint.UNSPECIFIED_DATE;
+ }
- public CDOID getObjectID()
- {
- return objectID;
- }
- };
- }
+ public CDOID getObjectID()
+ {
+ return null;
+ }
+ };
}
return super.getAdapter(adapter);

Back to the top