Migrate SLC modules

[gpl/argeo-slc.git] / plugins / org.argeo.slc.client.ui.dist / src / main / java / org / argeo / slc / client / ui / dist / editors / ModuleEditorInput.java

diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/ModuleEditorInput.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/ModuleEditorInput.java
index bc15959dcf3c323c589f2d0b5a739e596c95e09f..8c297259eb839c45e56f3f0c286ebc94aa1d8831 100644 (file)
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/ModuleEditorInput.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/ModuleEditorInput.java
@@ -37,8 +37,9 @@ public class ModuleEditorInput implements IEditorInput, SlcNames {
                        String workspaceName, String artifactPath) {
                if (workspaceName == null)
                        throw new SlcException("Workspace name cannot be null");
-               if (uri == null)
-                       throw new SlcException("URI for repository cannot be null");
+               if (uri == null && repoNodePath == null)
+                       throw new SlcException("Define at least one of the 2 "
+                                       + "parameters URI or Repo Node Path");
                if (artifactPath == null)
                        throw new SlcException("Module path cannot be null");
                this.repoNodePath = repoNodePath;
@@ -105,12 +106,15 @@ public class ModuleEditorInput implements IEditorInput, SlcNames {
                        return false;
                if (!workspaceName.equals(other.getWorkspaceName()))
                        return false;
-               if (!uri.equals(other.getUri()))
+
+               if (uri == null && other.getUri() != null
+                               || !uri.equals(other.getUri()))
+                       return false;
+
+               if (repoNodePath == null && other.getRepoNodePath() != null
+                               || !repoNodePath.equals(other.getRepoNodePath()))
                        return false;
 
-               if (repoNodePath == null)
-                       return other.getRepoNodePath() == null;
-               else
-                       return repoNodePath.equals(other.getRepoNodePath());
+               return true;
        }
 }
\ No newline at end of file