Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-10-13 07:25:31 +0000
committerEike Stepper2010-10-13 07:25:31 +0000
commit00b546825d6fd2073c3efc948127625803b64a7f (patch)
treefd94f6981f861bebdebcb84f6218c657b1745274
parent8b1600b91c78863cd972947ea7393e593843402f (diff)
downloadcdo-00b546825d6fd2073c3efc948127625803b64a7f.tar.gz
cdo-00b546825d6fd2073c3efc948127625803b64a7f.tar.xz
cdo-00b546825d6fd2073c3efc948127625803b64a7f.zip
fixed 2 3.0 compatibility issues
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryRequest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java5
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOObjectReferenceImpl.java (renamed from plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectReferenceImpl.java)2
3 files changed, 3 insertions, 8 deletions
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryRequest.java
index 651bf52646..8e7c4d4f8f 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryRequest.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.cdo.internal.common.CDOQueryInfoImpl;
import org.eclipse.emf.cdo.internal.net4j.bundle.OM;
import org.eclipse.emf.cdo.view.CDOView;
-import org.eclipse.emf.internal.cdo.CDOObjectReferenceImpl;
+import org.eclipse.emf.internal.cdo.util.CDOObjectReferenceImpl;
import org.eclipse.net4j.util.om.trace.ContextTracer;
@@ -66,7 +66,7 @@ public class QueryRequest extends CDOClientRequest<Boolean>
boolean xrefs = queryResult.getQueryInfo().getQueryLanguage().equals(CDOProtocolConstants.QUERY_LANGUAGE_XREFS);
if (xrefs)
{
- view = getSession().getView(viewID);
+ view = (CDOView)getSession().getView(viewID);
}
try
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java
index d3d50d0b89..239cc82138 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java
@@ -197,11 +197,6 @@ public interface CDOSession extends CDOCommonSession, CDOUpdatable, IContainer<C
public CDOView[] getViews();
/**
- * since 3.0.1
- */
- public CDOView getView(int viewID);
-
- /**
* Refreshes the object caches of all (non-historical) {@link CDOView views}.
*
* @since 3.0
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectReferenceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOObjectReferenceImpl.java
index 29ba04764d..3f8bbc14ea 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectReferenceImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOObjectReferenceImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
*/
-package org.eclipse.emf.internal.cdo;
+package org.eclipse.emf.internal.cdo.util;
import org.eclipse.emf.cdo.CDOObject;
import org.eclipse.emf.cdo.CDOObjectReference;

Back to the top