Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed Closing of the Shared Database Login Dialog if the user enters wrong authentication details - #4857 #4892

Merged
merged 11 commits into from
Apr 17, 2019
Merged

Fixed Closing of the Shared Database Login Dialog if the user enters wrong authentication details - #4857 #4892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
db5b44a
Fix for the issue - #4783 Group creation not possible anymore with de…
harinda05 Mar 22, 2019
212170f
resolved conflict in GroupDialog.java
harinda05 Mar 22, 2019
87cdd34
Changed the position of the listeners and onaction replaced with chan…
harinda05 Mar 22, 2019
f50059a
Removed changelog entry
harinda05 Mar 22, 2019
a029969
Merge branch 'master' of git://github.com/JabRef/jabref
harinda05 Mar 26, 2019
01f69c8
Fix for issue 4783 - Simplified listeners in to lambdas
harinda05 Mar 26, 2019
0457ccb
Update GroupDialog.java
tobiasdiez Mar 26, 2019
1544997
Merge remote-tracking branch 'upstream/master'
harinda05 Apr 12, 2019
0c575b1
Merge remote-tracking branch 'upstream/master'
harinda05 Apr 16, 2019
cf912e8
Fixed shared db dialog close when incorrect authentication details
harinda05 Apr 16, 2019
acc2d92
Changed Boolean in to boolean as requested changes - SharedDatabaseLo…
harinda05 Apr 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 8 additions & 7 deletions src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -122,7 +122,8 @@ public void openDatabase() {
connectionProperties.setServerTimezone(serverTimezone.getValue());

setupKeyStore();
openSharedDatabase(connectionProperties);
boolean connected = openSharedDatabase(connectionProperties);
return connected;
}

private void setupKeyStore() {
Expand All @@ -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()) {
Expand All @@ -149,7 +150,7 @@ private void openSharedDatabase(DBMSConnectionProperties connectionProperties) {
Localization.lang("Overwrite file"),
Localization.lang("Cancel"));
if (!overwriteFilePressed) {
return;
return true;
}
}
}
Expand All @@ -169,7 +170,7 @@ private void openSharedDatabase(DBMSConnectionProperties connectionProperties) {
}
}

return;
return true;
} catch (SQLException | InvalidDBMSConnectionPropertiesException exception) {

frame.getDialogService().showErrorDialogAndWait(Localization.lang("Connection error"), exception);
Expand All @@ -191,7 +192,7 @@ private void openSharedDatabase(DBMSConnectionProperties connectionProperties) {

}
loading.set(false);

return false;
}

private void setPreferences() {
Expand Down