(no commit message)

diff --git a/taxeditor-store/META-INF/MANIFEST.MF b/taxeditor-store/META-INF/MANIFEST.MF
index 8d784f594d0e3b1960e926433e9fb7600bf49eff..9a5529335b5a9907fa346183644e6d4bccc4d853 100644 (file)
--- a/taxeditor-store/META-INF/MANIFEST.MF
+++ b/taxeditor-store/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EDIT Taxonomic Editor - DataStore Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
-Bundle-Version: 2.0.0.v20090624-1625
+Bundle-Version: 2.0.0.v20090630-1147
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.datasource,

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceMySQLWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceMySQLWizardPage.java
index 8ab070c1efdb915ca393abe5e85e40d3452c7e6a..e5cc029ba6aa0cfd2eb9a74438132886f1706a68 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceMySQLWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceMySQLWizardPage.java
@@ -44,7 +44,8 @@ public class CdmDataSourceMySQLWizardPage extends CdmDataSourceCredentialsWizard
         */
        protected CdmDataSourceMySQLWizardPage(ICdmDataSource dataSource) {
                super("MySQL");
-               setTitle("Enter credentials for MySQL database");
+               setTitle("MySQL Server");
+               setDescription("Enter credentials for MySQL database");
                this.setDataSource(dataSource);
        }
        
@@ -81,13 +82,6 @@ public class CdmDataSourceMySQLWizardPage extends CdmDataSourceCredentialsWizard
                text_port.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
                text_port.addModifyListener(this);
                
-               if(getDataSource() != null){
-                       text_server.setText(getDataSource().getServer());
-                       text_port.setText(getDataSource().getPort()+"");
-                       text_databaseName.setText(getDataSource().getDatabase());
-                       text_username.setText(getDataSource().getUsername());
-                       text_password.setText(getDataSource().getPassword());
-               }
        }
 
        /* (non-Javadoc)
@@ -96,7 +90,11 @@ public class CdmDataSourceMySQLWizardPage extends CdmDataSourceCredentialsWizard
        @Override
        public void updateLocation() {
                server = text_server.getText();
-               port = new Integer(text_port.getText());
+               try{
+                       port = new Integer(text_port.getText());
+               }catch(NumberFormatException e){
+                       // pass
+               }
 
        }
 

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/LoginDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/LoginDialog.java
index 90a632b5841629e9abded84b06cd605d5405f506..539f162fd5c820f4233c26caa74f733ff07dac1f 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/LoginDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/LoginDialog.java
@@ -20,6 +20,7 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 import org.springframework.security.BadCredentialsException;
+import org.springframework.security.LockedException;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -97,9 +98,11 @@ public class LoginDialog extends Dialog {
                try{
                        CdmStore.getAuthenticationManager().authenticate(token);
                }catch(BadCredentialsException e){
-                       logger.error("Bad credentials");
+                       logger.error("Bad credentials", e);
+               }catch(LockedException e){
+                       logger.error("Account is locked", e);
                }catch(IllegalArgumentException e){
-                       logger.error("Null argument for either user or password");
+                       logger.error("Null argument for either user or password", e);
                }
                
                super.okPressed();

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/BerlinModelImportWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/BerlinModelImportWizard.java
index e18ab472f4d0e0094e33894f5a39389bedbaa4f0..90e57c2de5838d61aa0268192ea3d46a8bd63263 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/BerlinModelImportWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/BerlinModelImportWizard.java
@@ -18,6 +18,7 @@ import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator;
 import eu.etaxonomy.cdm.io.common.Source;
 import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository;
+import eu.etaxonomy.taxeditor.datasource.wizard.CdmDataSourceSQLServerWizardPage;
 import eu.etaxonomy.taxeditor.datasource.wizard.CdmDataSourceTypeSelectionWizardPage;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
@@ -30,7 +31,7 @@ public class BerlinModelImportWizard extends AbstractImportWizard<BerlinModelImp
        private static final Logger logger = Logger
                        .getLogger(BerlinModelImportWizard.class);
 
-       CdmDataSourceTypeSelectionWizardPage dataSourceSelectionPage;
+       CdmDataSourceSQLServerWizardPage dataSourcePage;
        
        BerlinModelImportConfigurator configurator;
        
@@ -47,10 +48,9 @@ public class BerlinModelImportWizard extends AbstractImportWizard<BerlinModelImp
        @Override
        public boolean performFinish() {
 
-               ICdmDataSource dataSource;
-               String dataSourceName = dataSourceSelectionPage.getDataSourceName();
-               if(dataSourceSelectionPage.getCredentialsWizardPage() != null){
-                       dataSource = dataSourceSelectionPage.getCredentialsWizardPage().getDataSource();
+               ICdmDataSource dataSource =null;
+               if(dataSourcePage != null){
+                       dataSource = dataSourcePage.getDataSource();
                }else{
                        throw new IllegalStateException("Expected a datasource credentials page to exist");
                }
@@ -67,6 +67,7 @@ public class BerlinModelImportWizard extends AbstractImportWizard<BerlinModelImp
                
                configurator.setSource(source);
                
+               // should be obsolete because we want to pass application context but is not at the moment (throws NPE when not given)
                configurator.setDestination(CdmDataSourceRepository.getDefault().getCurrentDataSource());
                
                configurator.setCdmAppController(CdmStore.getApplicationController());
@@ -89,7 +90,7 @@ public class BerlinModelImportWizard extends AbstractImportWizard<BerlinModelImp
        public void addPages() {
                super.addPages();
                
-               dataSourceSelectionPage = new CdmDataSourceTypeSelectionWizardPage(null);
-               addPage(dataSourceSelectionPage);
+               dataSourcePage = new CdmDataSourceSQLServerWizardPage(null);
+               addPage(dataSourcePage);
        }
 }

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
index 7316eb654283e7bda7c8276d3c1a75273b8db199..ca58fd53af07dcc821ac53e4b8c9b0208105b20b 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
@@ -10,6 +10,7 @@
 package eu.etaxonomy.taxeditor.preference;\r
 \r
 import java.util.ArrayList;\r
+import java.util.HashSet;\r
 import java.util.List;\r
 import java.util.Set;\r
 \r
@@ -136,13 +137,17 @@ public class PreferencesUtil {
         * Generic method to get term preferences for a term vocabulary\r
         * \r
         * @param <T>\r
-        * @param initialFeatures\r
+        * @param initialTerms\r
         * @return\r
         */\r
-       public static <T extends DefinedTermBase> List<T> getPreferredTerms(Set<T> initialFeatures){\r
+       public static <T extends DefinedTermBase> List<T> getPreferredTerms(Set<T> initialTerms){\r
+               \r
+               // set default for non existent preferences\r
+               defaultTerms(initialTerms);\r
+                               \r
                List<T> preferredTerms = new ArrayList<T>();\r
                \r
-               for (T term : initialFeatures){\r
+               for (T term : initialTerms){\r
                        if(getPreferenceStore().getBoolean(getPreferenceKey(term))){\r
                                preferredTerms.add(term);\r
                        }\r
@@ -151,6 +156,20 @@ public class PreferencesUtil {
                return preferredTerms;          \r
        }\r
        \r
+       private static <T extends DefinedTermBase> boolean defaultTerms(Set<T> initialTerms){\r
+               // set default for non existen preferences\r
+               for(T term : initialTerms){\r
+                       if(getPreferenceStore().getBoolean(term.getClass().getName())){\r
+                               break;\r
+                       }else{\r
+                               getPreferenceStore().setValue(term.getClass().getName(), true);\r
+                               setPreferredTerms(new ArrayList(initialTerms), initialTerms);\r
+                               break;\r
+                       }\r
+               }\r
+               return true;\r
+       }\r
+       \r
        \r
        /** @return a <code>List</code> containing user preferred <code>Feature</code> terms */\r
        public static List<SpecimenTypeDesignationStatus> getPreferredSpecimenTypeDesignationStatus() { return getPreferredTerms(VocabularyStore.getSpecimenTypeDesignationStatus());}\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
index 708e65c6542af0c0138a91bb8a76bdc0d72ced8e..ad79d9bdc8c882223c81bc6b9eb84224fe80d3d1 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
@@ -141,7 +141,7 @@ public class CdmStore{
         * @return
         */
        public List<TaxonomicTree> getTaxonomicTrees() {
-               return applicationController.getTaxonService().getAllTaxonomicTrees(10000, 0);
+               return applicationController.getTaxonService().listTaxonomicTrees(null, null, null, null);
        }
                
        
@@ -227,7 +227,7 @@ public class CdmStore{
 
                ITaxonServiceConfigurator configurator = new TaxonServiceConfiguratorImpl();
                
-               configurator.setSearchString(queryString);
+               configurator.setSearchString(queryString.trim());
                configurator.setDoTaxa(true);
                configurator.setMatchMode(MatchMode.BEGINNING);
                if (restrictToTaxonObjs) {