Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-12-22 07:18:22 -0500
committerEike Stepper2010-12-22 07:18:22 -0500
commit8e51b83543616ac83a586df027524bdf4b3ac4ed (patch)
treee7f5510b850e26c6ccb942f051caa7462e2d885b /plugins/org.eclipse.emf.cdo.workspace.efs
parent0a8414698f6dd92dcdbba6bac8d84561a8bbc7b4 (diff)
downloadcdo-8e51b83543616ac83a586df027524bdf4b3ac4ed.tar.gz
cdo-8e51b83543616ac83a586df027524bdf4b3ac4ed.tar.xz
cdo-8e51b83543616ac83a586df027524bdf4b3ac4ed.zip
[327405] Provide an offline CDOWorkspace with Checkout/Update/Commit workflows
https://bugs.eclipse.org/bugs/show_bug.cgi?id=327405
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.workspace.efs')
-rw-r--r--plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOResourceNodeStore.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOWorkspaceStore.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOResourceNodeStore.java b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOResourceNodeStore.java
index a2ebdda13a..38776a65b4 100644
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOResourceNodeStore.java
+++ b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOResourceNodeStore.java
@@ -150,7 +150,8 @@ public final class CDOResourceNodeStore extends AbstractResourceNodeStore
@Override
protected CDOResourceFolder run(CDOView view)
{
- return ((CDOTransaction)view).createResourceFolder(getPath());
+ String path = getPath();
+ return ((CDOTransaction)view).getOrCreateResourceFolder(path);
}
}.run(true);
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOWorkspaceStore.java b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOWorkspaceStore.java
index cc097b4770..952e7c619d 100644
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOWorkspaceStore.java
+++ b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOWorkspaceStore.java
@@ -262,7 +262,7 @@ public final class CDOWorkspaceStore extends AbstractResourceNodeStore
try
{
- CDOResource cdoResource = transaction.getResource(cdoPath);
+ CDOResource cdoResource = transaction.getOrCreateResource(cdoPath);
saveContents(xmiResource.getContents(), cdoResource.getContents());
}
finally

Back to the top