cleanup and fix codacy issues

JabRef · Nov 17, 2018 · 0c8a959 · 0c8a959
1 parent a7ea530
commit 0c8a959
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 19 deletions.
diff --git a/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogView.java b/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogView.java
@@ -7,6 +7,7 @@
 import javafx.scene.control.ToggleGroup;
 
 import org.jabref.gui.util.BaseDialog;
+import org.jabref.logic.l10n.Localization;
 
 import com.airhacks.afterburner.views.ViewLoader;
 
@@ -30,14 +31,15 @@ public AdvancedCiteDialogView() {
             return null;
         });
 
+        setTitle(Localization.lang("Cite special"));
     }
 
     @FXML
     private void initialize() {
         viewModel = new AdvancedCiteDialogViewModel();
 
         inPar.selectedProperty().bindBidirectional(viewModel.citeInParProperty());
-        inText.selectedProperty().bindBidirectional(viewModel.citeInTexTProperty());
+        inText.selectedProperty().bindBidirectional(viewModel.citeInTextProperty());
         pageInfo.textProperty().bindBidirectional(viewModel.pageInfoProperty());
 
     }

diff --git a/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogViewModel.java b/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogViewModel.java
@@ -19,7 +19,7 @@ public BooleanProperty citeInParProperty() {
         return citeInPar;
     }
 
-    public BooleanProperty citeInTexTProperty() {
+    public BooleanProperty citeInTextProperty() {
         return citeInText;
     }
 }
diff --git a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
@@ -52,7 +52,6 @@ private void initialize() throws NoSuchElementException, WrappedTargetException,
         viewModel = new ManageCitationsDialogViewModel(ooBase, dialogService);
 
         colCitation.setCellValueFactory(cellData -> cellData.getValue().citationProperty());
-
         new ValueTableCellFactory<ManageCitationsItemViewModel, String>().withGraphic(viewModel::getText).install(colCitation);
 
         colExtraInfo.setCellValueFactory(cellData -> cellData.getValue().extraInformationProperty());
@@ -66,6 +65,6 @@ private void initialize() throws NoSuchElementException, WrappedTargetException,
             cell.getRowValue().setExtraInfo(cell.getNewValue());
         });
         colExtraInfo.setCellFactory(TextFieldTableCell.forTableColumn());
-    }
 
-}
+    }
+}
diff --git a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java
@@ -58,8 +58,6 @@ public ManageCitationsDialogViewModel(OOBibBase ooBase, DialogService dialogServ
 
     }
 
-    //TODO: Call store settings after edit commit
-    //update reference then and call refresh/sync in the background
     public void storeSettings() {
         List<CitationEntry> ciationEntries = citations.stream().map(ManageCitationsItemViewModel::toCitationEntry).collect(Collectors.toList());
         try {

diff --git a/src/main/java/org/jabref/gui/openoffice/ManualConnectDialogView.java b/src/main/java/org/jabref/gui/openoffice/ManualConnectDialogView.java
@@ -94,17 +94,17 @@ private void initialize() {
     }
 
     @FXML
-    void browseOOPath(ActionEvent event) {
+    private void browseOOPath(ActionEvent event) {
         viewModel.browseOOPath();
     }
 
     @FXML
-    void browseOOExec(ActionEvent event) {
+    private void browseOOExec(ActionEvent event) {
         viewModel.browseOOExec();
     }
 
     @FXML
-    void browseOOJars(ActionEvent event) {
+    private void browseOOJars(ActionEvent event) {
         viewModel.browseOOJars();
     }
 

diff --git a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
@@ -153,8 +153,8 @@ private void initPanel() {
 
             try {
                 ooBase.selectDocument();
-                frame.output(Localization.lang("Connected to document") + ": "
-                             + ooBase.getCurrentDocumentTitle().orElse(""));
+                dialogService.notify(Localization.lang("Connected to document") + ": "
+                                     + ooBase.getCurrentDocumentTitle().orElse(""));
             } catch (UnknownPropertyException | WrappedTargetException | IndexOutOfBoundsException |
                      NoSuchElementException | NoDocumentException ex) {
                 LOGGER.warn("Problem connecting", ex);
@@ -174,7 +174,7 @@ private void initPanel() {
                 } catch (IOException e) {
                     LOGGER.warn("Unable to reload style file '" + style.getPath() + "'", e);
                 }
-                frame.setStatus(Localization.lang("Current style is '%0'", style.getName()));
+                dialogService.notify(Localization.lang("Current style is '%0'", style.getName()));
             });
 
         });
@@ -303,8 +303,7 @@ private void exportEntries() {
 
             }
 
-            Defaults defaults = new Defaults(Globals.prefs.getDefaultBibDatabaseMode());
-
+            Defaults defaults = new Defaults(jabRefPreferences.getDefaultBibDatabaseMode());
             BibDatabaseContext databaseContext = new BibDatabaseContext(newDatabase, defaults);
             this.frame.addTab(databaseContext, true);
 
@@ -374,7 +373,7 @@ private void connect() {
                               this.ooBase = ooBase;
 
                               if (ooBase.isConnectedToDocument()) {
-                                  frame.output(Localization.lang("Connected to document") + ": " + ooBase.getCurrentDocumentTitle().orElse(""));
+                                  dialogService.notify(Localization.lang("Connected to document") + ": " + ooBase.getCurrentDocumentTitle().orElse(""));
                               }
 
                               // Enable actions that depend on Connect:

diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.fxml b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.fxml
@@ -10,7 +10,7 @@
 
 <DialogPane minHeight="-Infinity" minWidth="-Infinity" prefHeight="470.0" prefWidth="701.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.openoffice.StyleSelectDialogView">
    <content>
-      <BorderPane fx:id="contentPane">
+      <BorderPane>
          <top>
             <TableView fx:id="tvStyles" prefHeight="208.0" prefWidth="662.0" BorderPane.alignment="CENTER">
               <columns>

diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
@@ -9,7 +9,6 @@
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
-import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.VBox;
 
 import org.jabref.gui.DialogService;
@@ -38,7 +37,6 @@ public class StyleSelectDialogView extends BaseDialog<OOBibStyle> {
     @FXML private TableColumn<StyleSelectItemViewModel, Boolean> colDeleteIcon;
     @FXML private Button add;
     @FXML private VBox vbox;
-    @FXML private BorderPane contentPane;
     private final MenuItem edit = new MenuItem(Localization.lang("Edit"));
     private final MenuItem reload = new MenuItem(Localization.lang("Reload"));
     @Inject private PreferencesService preferencesService;