task 1: Develop 0.8.0

3 files changed, 5 insertions, 5 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java
index d63cccc..01e7655 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java
@@ -26,19 +26,19 @@ public interface CDOSession extends IContainer<CDOView>
 
   public boolean isOpen();
 
-  public void close();
-
   public String getRepositoryName();
 
   public String getRepositoryUUID();
 
   public CDORevisionManager getRevisionManager();
 
+  public CDOView[] getViews();
+
   public CDOView openView(ResourceSet resourceSet, long timeStamp);
 
   public CDOView openView(ResourceSet resourceSet, boolean readOnly);
 
   public CDOView openView(ResourceSet resourceSet);
 
-  public CDOView[] getViews();
+  public void close();
 }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java
index 793f71e..0c77637 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java
@@ -53,7 +53,7 @@ public final class CDOUtil
     return session;
   }
 
-  public static CDOView getAdapter(ResourceSet resourceSet)
+  public static CDOView getView(ResourceSet resourceSet)
   {
     EList<Adapter> adapters = resourceSet.eAdapters();
     for (Adapter adapter : adapters)
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
index 5bbea9b..4acecac 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
@@ -240,7 +240,7 @@ public class CDOSessionImpl extends Lifecycle implements CDOSession
 
   private void prepare(ResourceSet resourceSet)
   {
-    CDOView adapter = CDOUtil.getAdapter(resourceSet);
+    CDOView adapter = CDOUtil.getView(resourceSet);
     if (adapter != null)
     {
       throw new IllegalStateException("CDO adapter already present: " + adapter);