ref #10221: some improvements for remote server view

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/remoteserver/CdmRemoteServerLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/remoteserver/CdmRemoteServerLabelProvider.java
index 61d844ffdfa0d2e669781659ab462c8b6d116832..9e0f372d3c3d55097fa98e51e43558fe8503c145 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/remoteserver/CdmRemoteServerLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/remoteserver/CdmRemoteServerLabelProvider.java
@@ -49,12 +49,13 @@ public class CdmRemoteServerLabelProvider extends LabelProvider implements ITabl
                        case 0:
                                return serverInfo.getName();
                        case 1:
-                               return serverInfo.getServer();
+                               return serverInfo.getServer();                  
                        case 2:
-                               return serverInfo.getPrefix();
+                               return serverInfo.getPort() != null?String.valueOf(serverInfo.getPort()): "";
                        case 3:
-                               return String.valueOf(serverInfo.getPort());
-                       
+                               return serverInfo.getPrefix();  
+                       case 4:
+                               return String.valueOf(!serverInfo.isIgnoreCdmLibVersion());
                }
                return null;
        }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/remoteserver/CdmRemoteServerViewPart.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/remoteserver/CdmRemoteServerViewPart.java
index a5196a4413bc221b6aafa88724b35af135c73b03..4d07f7127ce5ce72be35fa18194aace2a42da4c2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/remoteserver/CdmRemoteServerViewPart.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/remoteserver/CdmRemoteServerViewPart.java
@@ -137,8 +137,8 @@ public class CdmRemoteServerViewPart {
        // This will create the columns for the table
        private void createColumns(TableViewer viewer) {
                Table table = viewer.getTable();
-               String[] titles = {"Name", "Server", "Prefix", "Port"};
-               int[] bounds = { 200, 200, 100, 50 };
+               String[] titles = {"Name", "Server",  "Port", "Prefix", "Check version"};
+               int[] bounds = { 200, 200, 100, 50, 100 };
 
                for (int i = 0; i < titles.length; i++) {
                        TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/remoteserver/wizard/CdmRemoteServerWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/remoteserver/wizard/CdmRemoteServerWizard.java
index c996f141c2b96758e19bf5cfd736e2addce483bd..95d01f0e1d284341707922a34c216bd9bd363116 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/remoteserver/wizard/CdmRemoteServerWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/remoteserver/wizard/CdmRemoteServerWizard.java
@@ -39,7 +39,7 @@ public class CdmRemoteServerWizard extends Wizard {
        public CdmRemoteServerWizard() {
                super();
                this.mode = Mode.CREATE;
-               setForcePreviousAndNextButtons(true);
+               setForcePreviousAndNextButtons(false);
                setWindowTitle("Datasource Dialog");
        }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/remoteserver/wizard/CdmRemoteServerWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/remoteserver/wizard/CdmRemoteServerWizardPage.java
index 00155a7c0931172b1ee0a64853b1c98492f3fe96..97e52dd67959da03db99265fbe1335aad187cbcb 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/remoteserver/wizard/CdmRemoteServerWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/remoteserver/wizard/CdmRemoteServerWizardPage.java
@@ -52,7 +52,7 @@ public class CdmRemoteServerWizardPage extends WizardPage implements ModifyListe
        protected String server;
        protected String port;
        protected String prefix;
-
+       protected Boolean checkCdmLibVersion;
        CdmRemoteServerWizard.Mode mode;
 
        /**
@@ -80,7 +80,7 @@ public class CdmRemoteServerWizardPage extends WizardPage implements ModifyListe
                if(mode == CdmRemoteServerWizard.Mode.CLONE ) {
                        this.remoteServer = new CdmServerInfoConfig(remoteServer.getName(), remoteServer.getServer(), remoteServer.getPort(), remoteServer.getPrefix(),remoteServer.isIgnoreCdmLibVersion());
                } else if (mode == CdmRemoteServerWizard.Mode.CREATE){
-                       this.remoteServer = new CdmServerInfoConfig("New");
+                       this.remoteServer = new CdmServerInfoConfig("");
                        CdmRemoteServerRepository.add(this.remoteServer);
                } else {
                        this.remoteServer = remoteServer;
@@ -166,9 +166,9 @@ public class CdmRemoteServerWizardPage extends WizardPage implements ModifyListe
                if(getRemoteServer() != null && getRemoteServer().getName() != null){
                        text_name.setText(getRemoteServer().getName());
                        text_server.setText(getRemoteServer().getServer());
-                       text_port.setText(String.valueOf(getRemoteServer().getPort()));
+                       text_port.setText(getRemoteServer().getPort() != null?String.valueOf(getRemoteServer().getPort()): "");
                        text_prefix.setText(getRemoteServer().getPrefix());
-                       checkIgnoreCdmLibVersion.setSelection(getRemoteServer().isIgnoreCdmLibVersion());
+                       checkIgnoreCdmLibVersion.setSelection(!getRemoteServer().isIgnoreCdmLibVersion());
                }
                // add listeners after setting text to avoid the modify event being called
                // for the initial value
@@ -249,7 +249,7 @@ public class CdmRemoteServerWizardPage extends WizardPage implements ModifyListe
                port = text_port.getText();
                prefix = text_prefix.getText();
                this.remoteServer.setName(name != null? name:null);
-               this.remoteServer.setIgnoreCdmLibVersion(this.checkIgnoreCdmLibVersion.getSelection());
+               this.remoteServer.setIgnoreCdmLibVersion(!this.checkIgnoreCdmLibVersion.getSelection());
                this.remoteServer.setServer(server!= null? server:null);
                this.remoteServer.setPrefix(prefix != null?prefix:null);
                this.remoteServer.setPort(StringUtils.isNotBlank(port)?Integer.parseInt(port):0);
@@ -261,7 +261,7 @@ public class CdmRemoteServerWizardPage extends WizardPage implements ModifyListe
 
        @Override
        public void widgetSelected(SelectionEvent e) {
-               this.remoteServer.setIgnoreCdmLibVersion(checkIgnoreCdmLibVersion.getSelection());
+               this.remoteServer.setIgnoreCdmLibVersion(!checkIgnoreCdmLibVersion.getSelection());
                checkPageComplete();
                
        }