add PDW as option for target database and use switch for target dbType

OHDSI · Jan 28, 2022 · 99d11d5 · 99d11d5
1 parent ed366eb
commit 99d11d5
Showing 1 changed file with 29 additions and 23 deletions.
diff --git a/whiterabbit/src/main/java/org/ohdsi/whiteRabbit/WhiteRabbitMain.java b/whiterabbit/src/main/java/org/ohdsi/whiteRabbit/WhiteRabbitMain.java
@@ -564,7 +564,7 @@ public void actionPerformed(ActionEvent e) {
 		targetPanel.setLayout(new GridLayout(0, 2));
 		targetPanel.setBorder(BorderFactory.createTitledBorder("Target data location"));
 		targetPanel.add(new JLabel("Data type"));
-		targetType = new JComboBox<>(new String[] { "Delimited text files", "MySQL", "Oracle", "SQL Server", "PostgreSQL" });
+		targetType = new JComboBox<>(new String[] {"Delimited text files", "MySQL", "Oracle", "SQL Server", "PostgreSQL", "PDW"});
 		targetType.setToolTipText("Select the type of source data available");
 		targetType.addItemListener(event -> {
 			targetIsFiles = event.getItem().toString().equals("Delimited text files");
@@ -943,30 +943,36 @@ private DbSettings getTargetDbSettings() {
 			dbSettings.password = targetPasswordField.getText();
 			dbSettings.server = targetServerField.getText();
 			dbSettings.database = targetDatabaseField.getText();
-			if (targetType.getSelectedItem().toString().equals("MySQL"))
-				dbSettings.dbType = DbType.MYSQL;
-			else if (targetType.getSelectedItem().toString().equals("Oracle"))
-				dbSettings.dbType = DbType.ORACLE;
-			else if (targetType.getSelectedItem().toString().equals("PostgreSQL"))
-				dbSettings.dbType = DbType.POSTGRESQL;
-			else if (targetType.getSelectedItem().toString().equals("SQL Server")) {
-				dbSettings.dbType = DbType.MSSQL;
-				if (targetUserField.getText().length() != 0) { // Not using windows authentication
-					String[] parts = targetUserField.getText().split("/");
-					if (parts.length == 2) {
-						dbSettings.user = parts[1];
-						dbSettings.domain = parts[0];
+			switch(targetType.getSelectedItem().toString()) {
+				case "MySQL":
+					dbSettings.dbType = DbType.MYSQL;
+					break;
+				case "Oracle":
+					dbSettings.dbType = DbType.ORACLE;
+					break;
+				case "PostgreSQL":
+					dbSettings.dbType = DbType.POSTGRESQL;
+					break;
+				case "SQL Server":
+					dbSettings.dbType = DbType.MSSQL;
+					if (targetUserField.getText().length() != 0) { // Not using windows authentication
+						String[] parts = targetUserField.getText().split("/");
+						if (parts.length == 2) {
+							dbSettings.user = parts[1];
+							dbSettings.domain = parts[0];
+						}
 					}
-				}
-			} else if (targetType.getSelectedItem().toString().equals("PDW")) {
-				dbSettings.dbType = DbType.PDW;
-				if (targetUserField.getText().length() != 0) { // Not using windows authentication
-					String[] parts = targetUserField.getText().split("/");
-					if (parts.length == 2) {
-						dbSettings.user = parts[1];
-						dbSettings.domain = parts[0];
+					break;
+				case "PDW":
+					dbSettings.dbType = DbType.PDW;
+					if (targetUserField.getText().length() != 0) { // Not using windows authentication
+						String[] parts = targetUserField.getText().split("/");
+						if (parts.length == 2) {
+							dbSettings.user = parts[1];
+							dbSettings.domain = parts[0];
+						}
 					}
-				}
+					break;
 			}
 
 			if (dbSettings.database.trim().length() == 0) {