diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query')
3 files changed, 8 insertions, 8 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryCDOIDIteratorImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryCDOIDIteratorImpl.java index 3ecf4cb446..34a8f55585 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryCDOIDIteratorImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryCDOIDIteratorImpl.java @@ -13,7 +13,7 @@ package org.eclipse.emf.internal.cdo.query; import org.eclipse.emf.cdo.common.CDOQueryInfo; import org.eclipse.emf.cdo.view.CDOView; -import org.eclipse.emf.spi.cdo.AbstractQueryIteratorImpl; +import org.eclipse.emf.spi.cdo.AbstractQueryIterator; import java.util.ArrayList; import java.util.List; @@ -21,7 +21,7 @@ import java.util.List; /** * @author Simon McDuff */ -public class CDOQueryCDOIDIteratorImpl<CDOID> extends AbstractQueryIteratorImpl<CDOID> +public class CDOQueryCDOIDIteratorImpl<CDOID> extends AbstractQueryIterator<CDOID> { public CDOQueryCDOIDIteratorImpl(CDOView view, CDOQueryInfo queryInfo) { diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryImpl.java index 29b8fc4c57..738e0c5ab3 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryImpl.java @@ -23,7 +23,7 @@ import org.eclipse.emf.internal.cdo.util.ModelUtil; import org.eclipse.net4j.util.WrappedException; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.spi.cdo.AbstractQueryIteratorImpl; +import org.eclipse.emf.spi.cdo.AbstractQueryIterator; import org.eclipse.emf.spi.cdo.InternalCDOObject; import org.eclipse.emf.spi.cdo.InternalCDOView; @@ -62,7 +62,7 @@ public class CDOQueryImpl extends CDOQueryInfoImpl implements CDOQuery } @SuppressWarnings("unchecked") - protected <T> AbstractQueryIteratorImpl<T> createQueryResult(Class<T> classObject) + protected <T> AbstractQueryIterator<T> createQueryResult(Class<T> classObject) { CDOQueryInfoImpl queryInfo = createQueryInfo(); if (classObject.equals(CDOID.class)) @@ -75,14 +75,14 @@ public class CDOQueryImpl extends CDOQueryInfoImpl implements CDOQuery public <T> List<T> getResult(Class<T> classObject) { - AbstractQueryIteratorImpl<T> queryResult = createQueryResult(classObject); + AbstractQueryIterator<T> queryResult = createQueryResult(classObject); view.getSession().getSessionProtocol().query(view.getViewID(), queryResult); return queryResult.asList(); } public <T> BlockingCloseableIterator<T> getResultAsync(Class<T> classObject) { - final AbstractQueryIteratorImpl<T> queryResult = createQueryResult(classObject); + final AbstractQueryIterator<T> queryResult = createQueryResult(classObject); final Exception exception[] = new Exception[1]; Runnable runnable = new Runnable() { diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryResultIteratorImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryResultIteratorImpl.java index c1c729a771..e37b712a10 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryResultIteratorImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryResultIteratorImpl.java @@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.common.CDOQueryInfo; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.view.CDOView; -import org.eclipse.emf.spi.cdo.AbstractQueryIteratorImpl; +import org.eclipse.emf.spi.cdo.AbstractQueryIterator; import java.util.ArrayList; import java.util.List; @@ -23,7 +23,7 @@ import java.util.List; /** * @author Simon McDuff */ -public class CDOQueryResultIteratorImpl<T> extends AbstractQueryIteratorImpl<T> +public class CDOQueryResultIteratorImpl<T> extends AbstractQueryIterator<T> { public CDOQueryResultIteratorImpl(CDOView view, CDOQueryInfo queryInfo) { |