Fixed Closing of the Shared Database Login Dialog if the user enters …

…wrong authentication details - #4857 (#4892) * Fix for the issue - #4783 Group creation not possible anymore with default settings * Changed the position of the listeners and onaction replaced with changelistener * Removed changelog entry * Fix for issue 4783 - Simplified listeners in to lambdas * Update GroupDialog.java * Fixed shared db dialog close when incorrect authentication details * Changed Boolean in to boolean as requested changes - SharedDatabaseLoginDialog
JabRef · Apr 17, 2019 · 6fd0102 · 6fd0102
1 parent 9ab59d0
commit 6fd0102
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
@@ -67,8 +67,11 @@ public SharedDatabaseLoginDialogView(JabRefFrame frame) {
 
     @FXML
     private void openDatabase() {
-        viewModel.openDatabase();
-        this.close();
+        boolean connected = viewModel.openDatabase();
+
+        if (connected) {
+            this.close();
+        }
     }
 
     @FXML

diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
@@ -108,7 +108,7 @@ public SharedDatabaseLoginDialogViewModel(JabRefFrame frame, DialogService dialo
         applyPreferences();
     }
 
-    public void openDatabase() {
+    public boolean openDatabase() {
 
         DBMSConnectionProperties connectionProperties = new DBMSConnectionProperties();
         connectionProperties.setType(selectedDBMSType.getValue());
@@ -122,7 +122,8 @@ public void openDatabase() {
         connectionProperties.setServerTimezone(serverTimezone.getValue());
 
         setupKeyStore();
-        openSharedDatabase(connectionProperties);
+        boolean connected = openSharedDatabase(connectionProperties);
+        return connected;
     }
 
     private void setupKeyStore() {
@@ -131,12 +132,12 @@ private void setupKeyStore() {
         System.setProperty("javax.net.debug", "ssl");
     }
 
-    private void openSharedDatabase(DBMSConnectionProperties connectionProperties) {
+    private boolean openSharedDatabase(DBMSConnectionProperties connectionProperties) {
         if (isSharedDatabaseAlreadyPresent(connectionProperties)) {
 
             dialogService.showWarningDialogAndWait(Localization.lang("Shared database connection"),
                                                    Localization.lang("You are already connected to a database using entered connection details."));
-            return;
+            return true;
         }
 
         if (autosave.get()) {
@@ -149,7 +150,7 @@ private void openSharedDatabase(DBMSConnectionProperties connectionProperties) {
                                                                                            Localization.lang("Overwrite file"),
                                                                                            Localization.lang("Cancel"));
                 if (!overwriteFilePressed) {
-                    return;
+                    return true;
                 }
             }
         }
@@ -169,7 +170,7 @@ private void openSharedDatabase(DBMSConnectionProperties connectionProperties) {
                 }
             }
 
-            return;
+            return true;
         } catch (SQLException | InvalidDBMSConnectionPropertiesException exception) {
 
             frame.getDialogService().showErrorDialogAndWait(Localization.lang("Connection error"), exception);
@@ -191,7 +192,7 @@ private void openSharedDatabase(DBMSConnectionProperties connectionProperties) {
 
         }
         loading.set(false);
-
+        return false;
     }
 
     private void setPreferences() {