Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEsteban Dugueperoux2015-05-14 05:29:06 -0400
committerEike Stepper2015-05-14 05:29:06 -0400
commited8fd5c013e4c2c0fb134b95f7b8be75aaf0aa46 (patch)
tree3f8aa1db4fff448fc9ecbd4b61e50e2ce5fdb957 /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal
parentf9ad60bad8f4e3c07a8f0d4ac545d113f662e989 (diff)
downloadcdo-ed8fd5c013e4c2c0fb134b95f7b8be75aaf0aa46.tar.gz
cdo-ed8fd5c013e4c2c0fb134b95f7b8be75aaf0aa46.tar.xz
cdo-ed8fd5c013e4c2c0fb134b95f7b8be75aaf0aa46.zip
[456993] Have EClass.allInstances query works on branches
- Have EClass.allInstances ocl query works when no instances of EClass exists on the repository. - Have it also on branches. - Same for CDOView.queryInstances() query. - Don't returns deleted instances. Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=456993 Change-Id: I46cd0e05b6f99edb3bba4ac41158c7d3b4bc927d Signed-off-by: Esteban Dugueperoux <esteban.dugueperoux@obeo.fr> Signed-off-by: Eike Stepper <stepper@esc-net.de>
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal')
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java4
2 files changed, 2 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties
index 82bcf62fe5..3c0de29776 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties
@@ -22,7 +22,6 @@ CDOResourceNodeImpl.5=Duplicate path: {0}
CDOSessionConfigurationImpl.0=Session is already open
CDOSessionConfigurationImpl.1=Session is not open
CDOSessionFactory.1=Query is empty: {0}
-CDOSessionImpl.0=Generated packages locally not available: {0}
CDOSessionImpl.1=Commit notification arrived while view is inactive
CDOSessionImpl.2=Commit notification arrived while session is inactive
CDOStaleReferencePolicy.0=EXCEPTION
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
index 7a360af0cd..69beef82a3 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
@@ -52,6 +52,7 @@ import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta;
import org.eclipse.emf.cdo.common.revision.delta.CDOSetFeatureDelta;
import org.eclipse.emf.cdo.common.security.CDOPermission;
import org.eclipse.emf.cdo.common.util.CDOCommonUtil;
+import org.eclipse.emf.cdo.common.util.CDOPackageNotFoundException;
import org.eclipse.emf.cdo.common.util.RepositoryStateChangedEvent;
import org.eclipse.emf.cdo.common.util.RepositoryTypeChangedEvent;
import org.eclipse.emf.cdo.eresource.EresourcePackage;
@@ -82,7 +83,6 @@ import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
import org.eclipse.emf.cdo.spi.common.revision.PointerCDORevision;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.util.CDOUtil;
-import org.eclipse.emf.cdo.util.PackageNotFoundException;
import org.eclipse.emf.cdo.view.CDOFetchRuleManager;
import org.eclipse.emf.cdo.view.CDOView;
@@ -578,7 +578,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl impleme
{
if (!options().isGeneratedPackageEmulationEnabled())
{
- throw new PackageNotFoundException(packageUnit.getID());
+ throw new CDOPackageNotFoundException(packageUnit.getID());
}
}

Back to the top