1 files changed, 14 insertions, 15 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewSetImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewSetImpl.java
index e04dd7b0ee..5395adc862 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewSetImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewSetImpl.java
@@ -179,25 +179,24 @@ public class CDOViewSetImpl extends NotifierImpl implements InternalCDOViewSet
 
   public void setTarget(Notifier newTarget)
   {
-    if (resourceSet != null)
-    {
-      throw new IllegalStateException("Cannot associate more than 1 resourceset to this viewset");
-    }
-    if (isAdapterForType(newTarget))
+    if (!isAdapterForType(newTarget))
     {
-      resourceSet = (ResourceSet)newTarget;
-      EPackage.Registry oldPackageRegistry = resourceSet.getPackageRegistry();
-      packageRegistry = new CDOViewSetPackageRegistryImpl(this, oldPackageRegistry);
-      resourceSet.setPackageRegistry(packageRegistry);
-
-      Registry registry = resourceSet.getResourceFactoryRegistry();
-      Map<String, Object> map = registry.getProtocolToFactoryMap();
-      map.put(CDOProtocolConstants.PROTOCOL_NAME, getResourceFactory());
+      throw new IllegalArgumentException("Unsupported target: " + newTarget);
     }
-    else
+
+    if (resourceSet != null)
     {
-      throw new IllegalArgumentException("Doesn't support " + newTarget);
+      throw new IllegalStateException("Cannot associate more than 1 resource set with this view set");
     }
+
+    resourceSet = (ResourceSet)newTarget;
+    EPackage.Registry oldPackageRegistry = resourceSet.getPackageRegistry();
+    packageRegistry = new CDOViewSetPackageRegistryImpl(this, oldPackageRegistry);
+    resourceSet.setPackageRegistry(packageRegistry);
+
+    Registry registry = resourceSet.getResourceFactoryRegistry();
+    Map<String, Object> map = registry.getProtocolToFactoryMap();
+    map.put(CDOProtocolConstants.PROTOCOL_NAME, getResourceFactory());
   }
 
   public boolean isAdapterForType(Object type)