From 1a2bd7f69f93e54c45093a3c83a670d251a85320 Mon Sep 17 00:00:00 2001 From: Tanja Bergmann Date: Thu, 25 Sep 2014 18:28:57 +0200 Subject: [PATCH] Fix bug: Enable delete button of database connection. --- .../client/datasources/DatabaseConnectionTab.java | 6 +++--- .../client/datasources/GwtTestDatabaseConnectionTab.java | 7 ++++--- .../frontend/client/datasources/GwtTestTableInputTab.java | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/frontend/src/main/java/de/metanome/frontend/client/datasources/DatabaseConnectionTab.java b/frontend/src/main/java/de/metanome/frontend/client/datasources/DatabaseConnectionTab.java index 1f10b47c2..b260b1067 100644 --- a/frontend/src/main/java/de/metanome/frontend/client/datasources/DatabaseConnectionTab.java +++ b/frontend/src/main/java/de/metanome/frontend/client/datasources/DatabaseConnectionTab.java @@ -152,8 +152,8 @@ public void onClick(ClickEvent event) { }); this.connectionInputList.setWidget(row, 0, new HTML(input.getUrl())); - this.connectionInputList.setText(row, 1, input.getUsername()); - this.connectionInputList.setText(row, 2, input.getSystem().name()); + this.connectionInputList.setWidget(row, 1, new HTML(input.getUsername())); + this.connectionInputList.setWidget(row, 2, new HTML(input.getSystem().name())); this.connectionInputList.setText(row, 3, input.getComment()); this.connectionInputList.setWidget(row, 4, runButton); this.connectionInputList.setWidget(row, 5, deleteButton); @@ -200,7 +200,7 @@ public void updateDataSourcesOnRunConfiguration() { protected void setEnableOfDeleteButton(DatabaseConnection connection, boolean enabled) { int row = findRow(connection); - Button deleteButton = (Button) this.connectionInputList.getWidget(row, 4); + Button deleteButton = (Button) this.connectionInputList.getWidget(row, 5); deleteButton.setEnabled(enabled); } diff --git a/frontend/src/test/java/de/metanome/frontend/client/datasources/GwtTestDatabaseConnectionTab.java b/frontend/src/test/java/de/metanome/frontend/client/datasources/GwtTestDatabaseConnectionTab.java index 74cd3b418..440de9289 100644 --- a/frontend/src/test/java/de/metanome/frontend/client/datasources/GwtTestDatabaseConnectionTab.java +++ b/frontend/src/test/java/de/metanome/frontend/client/datasources/GwtTestDatabaseConnectionTab.java @@ -106,10 +106,11 @@ public void testSetEnableDeleteButton() throws EntityStorageException, InputVali page.connectionInputList.setWidget(0, 0, new HTML("url")); page.connectionInputList.setWidget(0, 1, new HTML("user")); page.connectionInputList.setWidget(0, 2, new HTML("DB2")); - page.connectionInputList.setWidget(0, 3, new Button("Run")); - page.connectionInputList.setWidget(0, 4, new Button("Delete")); + page.connectionInputList.setWidget(0, 3, new HTML("Comment")); + page.connectionInputList.setWidget(0, 4, new Button("Run")); + page.connectionInputList.setWidget(0, 5, new Button("Delete")); - Button actualButton = (Button) page.connectionInputList.getWidget(0, 4); + Button actualButton = (Button) page.connectionInputList.getWidget(0, 5); assertTrue(actualButton.isEnabled()); diff --git a/frontend/src/test/java/de/metanome/frontend/client/datasources/GwtTestTableInputTab.java b/frontend/src/test/java/de/metanome/frontend/client/datasources/GwtTestTableInputTab.java index e35a62255..017ed3bb7 100644 --- a/frontend/src/test/java/de/metanome/frontend/client/datasources/GwtTestTableInputTab.java +++ b/frontend/src/test/java/de/metanome/frontend/client/datasources/GwtTestTableInputTab.java @@ -135,12 +135,12 @@ public void testDeleteCallback() throws EntityStorageException, InputValidationE page.databaseConnectionTab.connectionInputList.setWidget(0, 0, new HTML("url1")); page.databaseConnectionTab.connectionInputList.setWidget(0, 1, new HTML("user1")); page.databaseConnectionTab.connectionInputList.setWidget(0, 2, new HTML("DB2")); - page.databaseConnectionTab.connectionInputList.setWidget(0, 4, deleteButton1); + page.databaseConnectionTab.connectionInputList.setWidget(0, 5, deleteButton1); page.databaseConnectionTab.connectionInputList.setWidget(1, 0, new HTML("url2")); page.databaseConnectionTab.connectionInputList.setWidget(1, 1, new HTML("user2")); page.databaseConnectionTab.connectionInputList.setWidget(1, 2, new HTML("DB2")); - page.databaseConnectionTab.connectionInputList.setWidget(1, 4, deleteButton2); + page.databaseConnectionTab.connectionInputList.setWidget(1, 5, deleteButton2); tableInputTab.tableInputList.setWidget(0, 0, new HTML("DB2; url1; user1")); tableInputTab.tableInputList.setWidget(0, 1, new HTML("table1")); @@ -160,7 +160,7 @@ public void testDeleteCallback() throws EntityStorageException, InputValidationE // Check assertEquals(rowCount - 1, tableInputTab.tableInputList.getRowCount()); assertEquals("table3", ((HTML) tableInputTab.tableInputList.getWidget(1, 1)).getText()); - assertTrue(((Button) page.databaseConnectionTab.connectionInputList.getWidget(1, 4)).isEnabled()); + assertTrue(((Button) page.databaseConnectionTab.connectionInputList.getWidget(1, 5)).isEnabled()); // Execute (delete Table Input 1) callback = tableInputTab.getDeleteCallback(tableInput1); @@ -169,7 +169,7 @@ public void testDeleteCallback() throws EntityStorageException, InputValidationE // Check assertEquals(rowCount - 2, tableInputTab.tableInputList.getRowCount()); assertEquals("table3", ((HTML) tableInputTab.tableInputList.getWidget(0, 1)).getText()); - assertTrue(((Button) page.databaseConnectionTab.connectionInputList.getWidget(0, 4)).isEnabled()); + assertTrue(((Button) page.databaseConnectionTab.connectionInputList.getWidget(0, 5)).isEnabled()); // Cleanup TestHelper.resetDatabaseSync();