Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon McDuff2008-10-15 23:35:26 +0000
committerSimon McDuff2008-10-15 23:35:26 +0000
commit26ee83ea483fcc3de3c037bac1a564416db5d9e0 (patch)
tree668577cf1036dc0d33b37d441b965e64ebe54242
parentd4cf12bcd94545bff4ac686fbce6aea92eb5f184 (diff)
downloadcdo-26ee83ea483fcc3de3c037bac1a564416db5d9e0.tar.gz
cdo-26ee83ea483fcc3de3c037bac1a564416db5d9e0.tar.xz
cdo-26ee83ea483fcc3de3c037bac1a564416db5d9e0.zip
[249847] Store resources in a hierarchical structure
https://bugs.eclipse.org/bugs/show_bug.cgi?id=249847
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/QueryTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java5
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java3
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java3
4 files changed, 12 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/QueryTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/QueryTest.java
index 5c8d096a80..f985e3e44b 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/QueryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/QueryTest.java
@@ -51,7 +51,7 @@ public class QueryTest extends AbstractCDOTest
objects.add(company1);
objects.add(category1);
-
+ objects.add(transaction.getRootResource());
company1.setName("TEST");
transaction.commit();
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java
index 7267257507..fa3f65cb5e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java
@@ -190,6 +190,11 @@ public interface CDOView extends CDOProtocolView, INotifier
public boolean hasResource(String path);
/**
+ * @since 2.0
+ */
+ public CDOResource getRootResource();
+
+ /**
* @see ResourceSet#getResource(URI, boolean)
* @since 2.0
*/
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
index 9c9bdd37a6..1d8a9a80f8 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
@@ -688,6 +688,9 @@ public class CDOResourceImpl extends CDOResourceNodeImpl implements CDOResource,
}
}
+ /**
+ * @since 2.0
+ */
@Override
public void cdoInternalPostDetach()
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java
index b33b51bd4e..6dac50dfde 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java
@@ -177,6 +177,9 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
return CDOIDUtil.createTempObject(++lastTemporaryID);
}
+ /**
+ * @since 2.0
+ */
@Override
protected CDOResourceImpl createRootResource()
{

Back to the top