fixes #1995

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceTypeSelectionWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceTypeSelectionWizardPage.java
index f2782b80aaa6ab14963012337178958fbb5117be..b646478a0c5a20a8cb334f9d31e4dffe7c284c53 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceTypeSelectionWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceTypeSelectionWizardPage.java
@@ -41,6 +41,13 @@ import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository;
  */
 public class CdmDataSourceTypeSelectionWizardPage extends WizardPage implements ModifyListener{
        
+       public static final DatabaseTypeEnum[] supportedDatabaseTypes = new DatabaseTypeEnum[]{
+               DatabaseTypeEnum.MySQL,                                                                                 
+               DatabaseTypeEnum.H2, 
+               DatabaseTypeEnum.PostgreSQL 
+               /*DatabaseTypeEnum.SqlServer2005*/
+       };
+       
        
        private ArrayList<DatabaseTypeEnum> databaseTypes;
        
@@ -139,14 +146,9 @@ public class CdmDataSourceTypeSelectionWizardPage extends WizardPage implements
                }
                
                // Add types to the type drop-down and to the types collection
-               for (DatabaseTypeEnum type : DatabaseTypeEnum.getAllTypes()) {
-                       // FIXME right now we filter supported types
-                       if(type.equals(DatabaseTypeEnum.MySQL)
-                               || type.equals(DatabaseTypeEnum.H2)
-                               || type.equals(DatabaseTypeEnum.SqlServer2005)){
-                               databaseTypeCombo.add(type.getName());
-                               databaseTypes.add(type);
-                       }
+               for (DatabaseTypeEnum type : supportedDatabaseTypes) {
+                       databaseTypeCombo.add(type.getName());
+                       databaseTypes.add(type);
                }
        }
        
@@ -161,11 +163,17 @@ public class CdmDataSourceTypeSelectionWizardPage extends WizardPage implements
                
                if(type == DatabaseTypeEnum.H2){
                        credentialsWizardPage = new CdmDataSourceH2WizardPage(dataSource);
-               }else if(type == DatabaseTypeEnum.MySQL){
+               }
+               else if(type == DatabaseTypeEnum.MySQL){
                        credentialsWizardPage = new CdmDataSourceMySQLWizardPage(dataSource);
-               }else if(type == DatabaseTypeEnum.SqlServer2005){
-                       credentialsWizardPage = new CdmDataSourceSQLServerWizardPage(dataSource);
                }
+               else if(type == DatabaseTypeEnum.PostgreSQL){
+                       credentialsWizardPage = new CdmDataSourcePostgreSQLServerWizardPage(dataSource);
+               }
+               
+//             else if(type == DatabaseTypeEnum.SqlServer2005){
+//                     credentialsWizardPage = new CdmDataSourceSQLServerWizardPage(dataSource);
+//             }
                
                if(wizard.getPage(credentialsWizardPage.getName()) != null){
                        nextPage = (WizardPage) wizard.getPage(credentialsWizardPage.getName());