Fix commands in dist UI
authorMathieu Baudier <mbaudier@argeo.org>
Fri, 16 Nov 2012 12:15:33 +0000 (12:15 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Fri, 16 Nov 2012 12:15:33 +0000 (12:15 +0000)
git-svn-id: https://svn.argeo.org/slc/trunk@5854 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/AddRepository.java
plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java

index 1c23608b571fbb1263ef349c224686c2f42a4469..f7c8a92ace2b5fe5fa0b56dc9e61bfc106be0d8e 100644 (file)
@@ -112,9 +112,9 @@ public class AddRepository extends AbstractHandler implements ArgeoNames,
                        composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true,
                                        false));
                        setMessage("Login to remote repository", IMessageProvider.NONE);
-                       name = createLT(composite, "Name", "Argeo.org Java Repository");
+                       name = createLT(composite, "Name", "Example Java Repository");
                        uri = createLT(composite, "URI",
-                                       "https://repo.argeo.org/org.argeo.jcr.webapp/remoting/java");
+                                       "https://example.com/data/jcr/java");
                        username = createLT(composite, "User", "");
                        password = createLP(composite, "Password");
 
index 455ab88071d9e1fcbe163f4787490fe2b0a8f58b..5c6fcdfda140ddcd007dbc07234577b89a181568 100644 (file)
@@ -186,19 +186,17 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames
                Object firstElement = ((IStructuredSelection) viewer.getSelection())
                                .getFirstElement();
 
-               if (firstElement instanceof TreeParent) {
-                       TreeParent tp = (TreeParent) firstElement;
-                       String wsName = tp.getName();
+               if (firstElement instanceof TreeParent
+                               || firstElement instanceof RepoElem) {
+                       String wsName = null;
 
                        // Build conditions depending on element type (repo or distribution
                        // for the time being)
                        boolean isDistribElem = false; // , isRepoElem = false;
 
-                       // if (tp instanceof RepositoryElem){
-                       // isRepoElem = true;
-                       // } else
-                       if (tp instanceof DistributionElem) {
+                       if (firstElement instanceof DistributionElem) {
                                isDistribElem = true;
+                               wsName = ((DistributionElem) firstElement).getName();
                        }
 
                        // create workspace