Improved preferences and fixed a bug

JabRef · Mar 28, 2016 · c4c779d · c4c779d
1 parent 9e1fd14
commit c4c779d
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 15 deletions.
diff --git a/src/main/java/net/sf/jabref/openoffice/AutoDetectPaths.java b/src/main/java/net/sf/jabref/openoffice/AutoDetectPaths.java
@@ -15,8 +15,6 @@
 */
 package net.sf.jabref.openoffice;
 
-import net.sf.jabref.Globals;
-import net.sf.jabref.JabRefPreferences;
 import net.sf.jabref.gui.worker.AbstractWorker;
 
 import javax.swing.*;
@@ -131,7 +129,7 @@ public String getDescription() {
                 fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
                 fileChooser.showOpenDialog(parent);
                 if (fileChooser.getSelectedFile() != null) {
-                    sOffice = fileChooser.getSelectedFile();
+                    sofficeFiles.add(fileChooser.getSelectedFile());
                 }
             }
             if (sOffice == null) {
@@ -247,7 +245,7 @@ private boolean setupPreferencesForOO(String usrRoot, File inUsr, String soffice
     }
 
     private boolean setupPreferencesForOO(File rootDir, File inUsr, String sofficeName) {
-        Globals.prefs.put(JabRefPreferences.OO_EXECUTABLE_PATH, new File(inUsr, sofficeName).getPath());
+        preferences.setExecutablePath(new File(inUsr, sofficeName).getPath());
         File jurt = findFileDir(rootDir, "jurt.jar");
         if (fileSearchCancelled) {
             return false;

diff --git a/src/main/java/net/sf/jabref/openoffice/OpenOfficePanel.java b/src/main/java/net/sf/jabref/openoffice/OpenOfficePanel.java
@@ -18,7 +18,8 @@
 import com.jgoodies.forms.builder.ButtonBarBuilder;
 import com.jgoodies.forms.builder.FormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
-import net.sf.jabref.*;
+
+import net.sf.jabref.Globals;
 import net.sf.jabref.gui.*;
 import net.sf.jabref.gui.help.HelpAction;
 import net.sf.jabref.gui.keyboard.KeyBinding;
@@ -322,17 +323,17 @@ private void connect(boolean auto) {
             }
 
             ooBaseDirectory = preferences.getJarsPath();
-            sOffice = Globals.prefs.get(JabRefPreferences.OO_EXECUTABLE_PATH);
+            sOffice = preferences.getExecutablePath();
         } else { // Manual connect
 
             showConnectDialog();
             if (!dialogOkPressed) {
                 return;
             }
 
-            String ooPath = Globals.prefs.get(JabRefPreferences.OO_PATH);
+            String ooPath = preferences.getOOPath();
             String ooJars = preferences.getJarsPath();
-            sOffice = Globals.prefs.get(JabRefPreferences.OO_EXECUTABLE_PATH);
+            sOffice = preferences.getExecutablePath();
 
             if (OS.WINDOWS) {
                 ooBaseDirectory = ooPath + "\\program\\classes";
@@ -443,12 +444,12 @@ private void showConnectDialog() {
         final JDialog cDiag = new JDialog(frame, Localization.lang("Set connection parameters"), true);
         final JTextField ooPath = new JTextField(30);
         JButton browseOOPath = new JButton(Localization.lang("Browse"));
-        ooPath.setText(Globals.prefs.get(JabRefPreferences.OO_PATH));
+        ooPath.setText(preferences.getOOPath());
         browseOOPath.addActionListener(BrowseAction.buildForDir(ooPath));
 
         final JTextField ooExec = new JTextField(30);
         JButton browseOOExec = new JButton(Localization.lang("Browse"));
-        ooExec.setText(Globals.prefs.get(JabRefPreferences.OO_EXECUTABLE_PATH));
+        ooExec.setText(preferences.getExecutablePath());
         browseOOExec.addActionListener(BrowseAction.buildForFile(ooExec));
 
         final JTextField ooJars = new JTextField(30);

diff --git a/src/main/java/net/sf/jabref/openoffice/OpenOfficePreferences.java b/src/main/java/net/sf/jabref/openoffice/OpenOfficePreferences.java
@@ -38,19 +38,21 @@ public void putDefaultPreferences() {
         preferences.putDefaultValue(JabRefPreferences.OO_SYNC_WHEN_CITING, false);
         preferences.putDefaultValue(JabRefPreferences.OO_SHOW_PANEL, false);
         preferences.putDefaultValue(JabRefPreferences.OO_USE_ALL_OPEN_BASES, true);
+        preferences.putDefaultValue(JabRefPreferences.OO_BIBLIOGRAPHY_STYLE_FILE,
+                StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH);
+        preferences.putDefaultValue(JabRefPreferences.OO_EXTERNAL_STYLE_FILES, "");
     }
 
     public void updateConnectionParams(String ooPath, String execPath, String jarsPath) {
-        preferences.put(JabRefPreferences.OO_PATH, ooPath);
-        preferences.put(JabRefPreferences.OO_EXECUTABLE_PATH, execPath);
+        setOOPath(ooPath);
+        setExecutablePath(execPath);
         setJarsPath(jarsPath);
     }
 
     public boolean checkAutoDetectedPaths() {
         if (preferences.hasKey(JabRefPreferences.OO_JARS_PATH)
                 && preferences.hasKey(JabRefPreferences.OO_EXECUTABLE_PATH)) {
-            return new File(getJarsPath(), "jurt.jar").exists()
-                    && new File(preferences.get(JabRefPreferences.OO_EXECUTABLE_PATH)).exists();
+            return new File(getJarsPath(), "jurt.jar").exists() && new File(getExecutablePath()).exists();
         } else {
             return false;
         }
@@ -71,6 +73,22 @@ public void setJarsPath(String path) {
         preferences.put(JabRefPreferences.OO_JARS_PATH, path);
     }
 
+    public String getExecutablePath() {
+        return preferences.get(JabRefPreferences.OO_EXECUTABLE_PATH);
+    }
+
+    public void setExecutablePath(String path) {
+        preferences.put(JabRefPreferences.OO_EXECUTABLE_PATH, path);
+    }
+
+    public String getOOPath() {
+        return preferences.get(JabRefPreferences.OO_PATH);
+    }
+
+    public void setOOPath(String path) {
+        preferences.put(JabRefPreferences.OO_PATH, path);
+    }
+
     public boolean useAllDatabases() {
         return preferences.getBoolean(JabRefPreferences.OO_USE_ALL_OPEN_BASES);
     }

diff --git a/src/main/java/net/sf/jabref/openoffice/StyleSelectDialog.java b/src/main/java/net/sf/jabref/openoffice/StyleSelectDialog.java
@@ -148,7 +148,7 @@ private void init() {
         updateStyles();
 
         // Build dialog
-        diag = new JDialog(frame, Localization.lang("Styles"), true);
+        diag = new JDialog(frame, Localization.lang("Select style"), true);
 
         FormBuilder builder = FormBuilder.create();
         builder.layout(new FormLayout("fill:pref:grow, 4dlu, left:pref, 4dlu, left:pref",