Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-03-19 08:51:36 +0000
committerEike Stepper2015-03-19 09:30:32 +0000
commit300015ebc05db0c99569aa0a0511a04125c927e6 (patch)
tree90d82e4285329ba04e46675eecd2614ab83572a2 /plugins/org.eclipse.emf.cdo.explorer
parent6f45700d6655330bdec97d48683ec38b52ceacd9 (diff)
downloadcdo-300015ebc05db0c99569aa0a0511a04125c927e6.tar.gz
cdo-300015ebc05db0c99569aa0a0511a04125c927e6.tar.xz
cdo-300015ebc05db0c99569aa0a0511a04125c927e6.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/internal/explorer/checkouts/CDOCheckoutImpl.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/OnlineCDOCheckout.java5
3 files changed, 16 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java
index 6c7fede8b8..9c99aa6f7d 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java
@@ -113,6 +113,11 @@ public abstract class CDOCheckoutImpl extends AbstractElement implements CDOChec
{
}
+ public CDOCheckoutImpl(boolean readOnly)
+ {
+ this.readOnly = readOnly;
+ }
+
@Override
public final CDOCheckoutManagerImpl getManager()
{
@@ -319,7 +324,7 @@ public abstract class CDOCheckoutImpl extends AbstractElement implements CDOChec
public void setReadOnly(boolean readOnly)
{
- if (state != State.Open)
+ if (state != State.Closed)
{
throw new IllegalStateException("Checkout is not closed: " + this);
}
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 4f337e4e01..7e19653d37 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
@@ -86,6 +86,11 @@ public class CDOCheckoutManagerImpl extends AbstractManager<CDOCheckout> impleme
return new OnlineCDOCheckout();
}
+ if (CDOCheckout.TYPE_ONLINE_HISTORICAL.equals(type))
+ {
+ return new OnlineCDOCheckout(true);
+ }
+
if (CDOCheckout.TYPE_OFFLINE.equals(type))
{
return new OfflineCDOCheckout();
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/OnlineCDOCheckout.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/OnlineCDOCheckout.java
index 81adf45a6a..55c65a40c9 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/OnlineCDOCheckout.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/OnlineCDOCheckout.java
@@ -31,6 +31,11 @@ public class OnlineCDOCheckout extends CDOCheckoutImpl
{
}
+ public OnlineCDOCheckout(boolean readOnly)
+ {
+ super(readOnly);
+ }
+
public boolean isOffline()
{
return false;

Back to the top