Fix npe on disconnect when session is not inlitiazed

JabRef · Jul 15, 2017 · 05cace0 · 05cace0
1 parent 325f978
commit 05cace0
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 13 deletions.
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -67,11 +67,12 @@
 import org.jabref.gui.actions.Actions;
 import org.jabref.gui.actions.AutoLinkFilesAction;
 import org.jabref.gui.actions.ConnectToSharedDatabaseAction;
+import org.jabref.gui.actions.DisconnectFromSharelatexAction;
 import org.jabref.gui.actions.ErrorConsoleAction;
 import org.jabref.gui.actions.IntegrityCheckAction;
 import org.jabref.gui.actions.LookupIdentifierAction;
 import org.jabref.gui.actions.ManageKeywordsAction;
-import org.jabref.gui.actions.ManageShareLatexAction;
+import org.jabref.gui.actions.SynchronizeWithShareLatexAction;
 import org.jabref.gui.actions.MassSetFieldAction;
 import org.jabref.gui.actions.MnemonicAwareAction;
 import org.jabref.gui.actions.NewDatabaseAction;
@@ -394,8 +395,9 @@ public void actionPerformed(ActionEvent e) {
             Localization.lang("Unabbreviate journal names of the selected entries"),
             Globals.getKeyPrefs().getKey(KeyBinding.UNABBREVIATE));
     private final AbstractAction manageJournals = new ManageJournalsAction();
-    private final AbstractAction manageSharelatex = new ManageShareLatexAction();
+    private final AbstractAction synchronizeWithSharelatex = new SynchronizeWithShareLatexAction();
     private final AbstractAction sendChangesToShareLatex = new SendChangesToShareLatexAction();
+    private final AbstractAction disconnectFromSharelatex = new DisconnectFromSharelatexAction();
 
     private final AbstractAction databaseProperties = new DatabasePropertiesAction();
     private final AbstractAction bibtexKeyPattern = new BibtexKeyPatternAction();
@@ -1060,8 +1062,9 @@ private void fillMenu() {
         file.add(connectToSharedDatabaseAction);
         file.add(pullChangesFromSharedDatabase);
         file.addSeparator();
-        file.add(manageSharelatex);
+        file.add(synchronizeWithSharelatex);
         file.add(sendChangesToShareLatex);
+        file.add(disconnectFromSharelatex);
 
         file.addSeparator();
         file.add(databaseProperties);
@@ -1338,7 +1341,7 @@ private void createToolBar() {
         tlb.addAction(cleanupEntries);
         tlb.addAction(mergeEntries);
         tlb.addAction(pullChangesFromSharedDatabase);
-        tlb.addAction(manageSharelatex);
+        tlb.addAction(synchronizeWithSharelatex);
         tlb.addAction(openConsole);
 
         tlb.addSeparator();

diff --git a/src/main/java/org/jabref/gui/actions/DisconnectFromSharelatexAction.java b/src/main/java/org/jabref/gui/actions/DisconnectFromSharelatexAction.java
@@ -0,0 +1,23 @@
+package org.jabref.gui.actions;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+
+import org.jabref.Globals;
+
+public class DisconnectFromSharelatexAction extends AbstractAction {
+
+    public DisconnectFromSharelatexAction() {
+        super();
+        putValue(Action.NAME, "Disconnect from ShareLaTeX");
+
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        Globals.shareLatexManager.disconnectAndCloseConnection();
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/actions/SendChangesToShareLatexAction.java b/src/main/java/org/jabref/gui/actions/SendChangesToShareLatexAction.java
@@ -22,7 +22,7 @@ public void actionPerformed(ActionEvent e) {
 
         ShareLatexManager manager = Globals.shareLatexManager;
         StateManager stateManager = Globals.stateManager;
-        manager.sendNewDataseContent(stateManager.getActiveDatabase().get());
+        manager.sendNewDatabaseContent(stateManager.getActiveDatabase().get());
         System.out.println("Send changes");
     }
 

diff --git a/...f/gui/actions/ManageShareLatexAction.java → ...ions/SynchronizeWithShareLatexAction.java b/...f/gui/actions/ManageShareLatexAction.java → ...ions/SynchronizeWithShareLatexAction.java
@@ -10,9 +10,9 @@
 import org.jabref.gui.IconTheme;
 import org.jabref.gui.sharelatex.ShareLatexLoginDialogView;
 
-public class ManageShareLatexAction extends AbstractAction {
+public class SynchronizeWithShareLatexAction extends AbstractAction {
 
-    public ManageShareLatexAction() {
+    public SynchronizeWithShareLatexAction() {
         super();
         putValue(Action.NAME, "Synchronize with ShareLaTeX");
         putValue(Action.SMALL_ICON, IconTheme.getImage("sharelatex"));

diff --git a/src/main/java/org/jabref/logic/sharelatex/ShareLatexManager.java b/src/main/java/org/jabref/logic/sharelatex/ShareLatexManager.java
@@ -64,7 +64,7 @@ public void startWebSocketHandler(String projectID, BibDatabaseContext database,
         });
     }
 
-    public void sendNewDataseContent(BibDatabaseContext database) {
+    public void sendNewDatabaseContent(BibDatabaseContext database) {
         try {
             BibtexDatabaseWriter<StringSaveSession> databaseWriter = new BibtexDatabaseWriter<>(StringSaveSession::new);
             SavePreferences preferences = new SavePreferences().withEncoding(StandardCharsets.UTF_8).withSaveInOriginalOrder(true);

diff --git a/src/main/java/org/jabref/logic/sharelatex/WebSocketClientWrapper.java b/src/main/java/org/jabref/logic/sharelatex/WebSocketClientWrapper.java
@@ -85,8 +85,8 @@ public void createAndConnect(URI webSocketchannelUri, String projectId, BibDatab
                 public boolean onConnectFailure(Exception exception) {
                     final int i = counter.incrementAndGet();
                     if (i <= 3) {
-                        System.out.println(
-                                "### Reconnecting... (reconnect count: " + i + ") " + exception.getMessage());
+                        LOGGER.debug(
+                                "### Reconnecting... (reconnect count: " + i + ")", exception);
                         return true;
                     } else {
                         messageLatch.countDown();
@@ -155,7 +155,9 @@ public void joinDoc(String documentId) throws IOException {
     public void leaveDocument(String documentId) throws IOException {
         incrementCommandCounter();
         String text = "5:" + commandCounter + "+::{\"name\":\"leaveDoc\",\"args\":[\"" + documentId + "\"]}";
-        session.getBasicRemote().sendText(text);
+        if (session != null) {
+            session.getBasicRemote().sendText(text);
+        }
 
     }
 
@@ -284,8 +286,9 @@ public void setDatabaseName(String bibFileName) {
     public void leaveDocAndCloseConn() throws IOException {
         leaveDocument(docId);
         queue.clear();
-        session.close();
-
+        if (session != null) {
+            session.close();
+        }
     }
 
     public void setServerNameOrigin(String serverOrigin) {