Enabled the deletion of database connections (#447)

sldeditor · Oct 3, 2019 · 4b33b4e · 4b33b4e
1 parent 87b068b
commit 4b33b4e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/...ication/src/main/java/com/sldeditor/tool/dbconnectionlist/DatabaseConnectionListTool.java b/...ication/src/main/java/com/sldeditor/tool/dbconnectionlist/DatabaseConnectionListTool.java
@@ -24,6 +24,7 @@
 import com.sldeditor.common.data.DatabaseConnection;
 import com.sldeditor.common.localisation.Localisation;
 import com.sldeditor.datasource.extension.filesystem.DatabaseConnectUpdateInterface;
+import com.sldeditor.datasource.extension.filesystem.node.database.DatabaseNode;
 import com.sldeditor.datasource.extension.filesystem.node.database.DatabaseOverallNode;
 import com.sldeditor.tool.ToolButton;
 import com.sldeditor.tool.ToolInterface;
@@ -192,6 +193,10 @@ public void setSelectedItems(
                     DatabaseOverallNode databaseOverallNode = (DatabaseOverallNode) nodeType;
                     selectedDatabaseType = databaseOverallNode.toString();
                     canDuplicate = false;
+                } else if (nodeType instanceof DatabaseNode) {
+                    DatabaseNode databaseNode = (DatabaseNode) nodeType;
+                    connectionList.add(databaseNode.getConnection());
+                    databaseNodesSelected = true;
                 }
             }
         }

diff --git a/...st/java/com/sldeditor/test/unit/tool/dbconnectionlist/DatabaseConnectionListToolTest.java b/...st/java/com/sldeditor/test/unit/tool/dbconnectionlist/DatabaseConnectionListToolTest.java
@@ -196,18 +196,18 @@ void testSetSelectedItems() {
         DatabaseConnection dbConnection = DatabaseConnectionFactory.createPostgres();
         nodeTypeList.add(new DatabaseNode(null, dbConnection));
         testTool.setSelectedItems(nodeTypeList, sldDataList);
-        assertFalse(testTool.isEditButtonEnabled());
-        assertFalse(testTool.isDuplicateButtonEnabled());
-        assertFalse(testTool.isDeleteButtonEnabled());
+        assertTrue(testTool.isEditButtonEnabled());
+        assertTrue(testTool.isDuplicateButtonEnabled());
+        assertTrue(testTool.isDeleteButtonEnabled());
 
         // Try a DatabaseNode -- does not support duplication
         nodeTypeList.clear();
         dbConnection = DatabaseConnectionFactory.createH2();
         nodeTypeList.add(new DatabaseNode(null, dbConnection));
         testTool.setSelectedItems(nodeTypeList, sldDataList);
-        assertFalse(testTool.isEditButtonEnabled());
-        assertFalse(testTool.isDuplicateButtonEnabled());
-        assertFalse(testTool.isDeleteButtonEnabled());
+        assertTrue(testTool.isEditButtonEnabled());
+        assertTrue(testTool.isDuplicateButtonEnabled());
+        assertTrue(testTool.isDeleteButtonEnabled());
 
         // Try multiple DatabaseNodes
         nodeTypeList.clear();
@@ -216,7 +216,7 @@ void testSetSelectedItems() {
         testTool.setSelectedItems(nodeTypeList, sldDataList);
         assertFalse(testTool.isEditButtonEnabled());
         assertFalse(testTool.isDuplicateButtonEnabled());
-        assertFalse(testTool.isDeleteButtonEnabled());
+        assertTrue(testTool.isDeleteButtonEnabled());
     }
 
     /**
@@ -274,11 +274,11 @@ void testButtons() {
         testTool.setSelectedItems(nodeTypeList, sldDataList);
 
         testTool.duplicateButtonPressed();
-        assertEquals(1, receiver.dbList.size());
+        assertEquals(2, receiver.dbList.size());
 
         // Edit
         nodeTypeList.clear();
-        assertEquals(1, receiver.dbList.size());
+        assertEquals(2, receiver.dbList.size());
         nodeTypeList.add(new DatabaseNode(null, receiver.dbList.get(0)));
         testTool.setSelectedItems(nodeTypeList, sldDataList);
         testTool.editButtonPressed();