From: n.hoffmann <n.hoffmann@localhost>
Date: Wed, 1 Jul 2009 09:43:55 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: rcp.ss-first-working-version~821
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/ab1f815519b28c6df9c955878672eee7076a1a50

---

diff --git a/taxeditor-store/META-INF/MANIFEST.MF b/taxeditor-store/META-INF/MANIFEST.MF
index 8d784f594..9a5529335 100644
--- 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 8ab070c1e..e5cc029ba 100644
--- 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 90a632b58..539f162fd 100644
--- 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 e18ab472f..90e57c2de 100644
--- 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 7316eb654..ca58fd53a 100644
--- 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;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -136,13 +137,17 @@ public class PreferencesUtil {
 	 * Generic method to get term preferences for a term vocabulary
 	 * 
 	 * @param <T>
-	 * @param initialFeatures
+	 * @param initialTerms
 	 * @return
 	 */
-	public static <T extends DefinedTermBase> List<T> getPreferredTerms(Set<T> initialFeatures){
+	public static <T extends DefinedTermBase> List<T> getPreferredTerms(Set<T> initialTerms){
+		
+		// set default for non existent preferences
+		defaultTerms(initialTerms);
+				
 		List<T> preferredTerms = new ArrayList<T>();
 		
-		for (T term : initialFeatures){
+		for (T term : initialTerms){
 			if(getPreferenceStore().getBoolean(getPreferenceKey(term))){
 				preferredTerms.add(term);
 			}
@@ -151,6 +156,20 @@ public class PreferencesUtil {
 		return preferredTerms;		
 	}
 	
+	private static <T extends DefinedTermBase> boolean defaultTerms(Set<T> initialTerms){
+		// set default for non existen preferences
+		for(T term : initialTerms){
+			if(getPreferenceStore().getBoolean(term.getClass().getName())){
+				break;
+			}else{
+				getPreferenceStore().setValue(term.getClass().getName(), true);
+				setPreferredTerms(new ArrayList(initialTerms), initialTerms);
+				break;
+			}
+		}
+		return true;
+	}
+	
 	
 	/** @return a <code>List</code> containing user preferred <code>Feature</code> terms */
 	public static List<SpecimenTypeDesignationStatus> getPreferredSpecimenTypeDesignationStatus() { return getPreferredTerms(VocabularyStore.getSpecimenTypeDesignationStatus());}
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 708e65c65..ad79d9bdc 100644
--- 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) {