From ebaa26cc434d29981f388a96a5ca0ae8f40a0587 Mon Sep 17 00:00:00 2001 From: Johannes Date: Wed, 25 Nov 2015 23:51:00 +0100 Subject: [PATCH] =?UTF-8?q?final=20=C3=BCberall=20da=20wo=20intellij=20das?= =?UTF-8?q?=20meinte?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mi/projmi6/controller/DiagnoseController.java | 6 +++--- .../uniluebeck/mi/projmi6/controller/FallController.java | 4 ++-- .../uniluebeck/mi/projmi6/controller/LogController.java | 2 +- .../uniluebeck/mi/projmi6/controller/MainController.java | 16 ++++++++-------- .../mi/projmi6/controller/MessageController.java | 2 +- .../mi/projmi6/controller/PatientEditorController.java | 2 +- .../mi/projmi6/controller/PatientTablesController.java | 4 ++-- .../mi/projmi6/controller/SettingsController.java | 4 ++-- .../projmi6/controller/StationsHistorieController.java | 6 +++--- .../mi/projmi6/controller/UntersuchungenController.java | 4 ++-- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java index 08d5286..3255db9 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java @@ -23,7 +23,7 @@ import javafx.scene.layout.GridPane; */ public class DiagnoseController { - private SimpleObjectProperty> diagnosen = new SimpleObjectProperty<>(); + private final SimpleObjectProperty> diagnosen = new SimpleObjectProperty<>(); /** * Controller state definitions @@ -203,7 +203,7 @@ public class DiagnoseController { * EventHandler for the {@link #btnDiagCreate}. */ @FXML - void clickedDiagCreate() { + private void clickedDiagCreate() { this.state.set(State.CREATE); } @@ -211,7 +211,7 @@ public class DiagnoseController { * EventHandler for the {@link #btnDiagCancel}. */ @FXML - void clickedDiagCancel() { + private void clickedDiagCancel() { } diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java index 102a84c..3a05e5a 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java @@ -33,7 +33,7 @@ public class FallController { * Controllers current state. */ private final SimpleObjectProperty state = new SimpleObjectProperty<>(State.VIEW); - private MainController mainController; + private final MainController mainController; @FXML private DateTimePicker dtTmAufnahme, dtTmEntlassung; @FXML @@ -248,7 +248,7 @@ public class FallController { /** * Toggle controller state to edit */ - public void editFall() { + private void editFall() { this.state.set(State.EDIT); } diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/LogController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/LogController.java index e58267b..4590bcc 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/LogController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/LogController.java @@ -75,7 +75,7 @@ public class LogController { //Change cell factory cuz we need scrollable fields colLogMessage.setCellFactory(column -> new TableCell() { - private TextArea textArea = new TextArea(); + private final TextArea textArea = new TextArea(); { textArea.setEditable(false); diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java index 45baae5..f8b103d 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java @@ -27,14 +27,14 @@ public class MainController { /** * The subcontroller instances */ - private FallController fallController; - private DiagnoseController diagnoseController; - private PatientTablesController patientTablesController; - private SettingsController settingsController; - private StationsHistorieController stationsHistorieController; - private UntersuchungenController untersuchungenController; - private LogController logController; - private MessageController messageController; + private FallController fallController; + private DiagnoseController diagnoseController; + private PatientTablesController patientTablesController; + private SettingsController settingsController; + private StationsHistorieController stationsHistorieController; + private UntersuchungenController untersuchungenController; + private LogController logController; + private MessageController messageController; /** diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/MessageController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/MessageController.java index 03c13c8..ea65158 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/MessageController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/MessageController.java @@ -23,7 +23,7 @@ public class MessageController { /** * The superior controller */ - final MainController mainController; + private final MainController mainController; /** * The list of unread messages diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientEditorController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientEditorController.java index 329d007..700754a 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientEditorController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientEditorController.java @@ -25,7 +25,7 @@ public class PatientEditorController { /** * The superior controller */ - private MainController mainController; + private final MainController mainController; @FXML private Label patChangeTime, patChanger, patCreator, patCreateTime; diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientTablesController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientTablesController.java index d28023c..afc7aa8 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientTablesController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientTablesController.java @@ -73,8 +73,8 @@ public class PatientTablesController { @FXML private Tab stationOverviewTab, patientOverviewTab; - private ObservableList stationsUebersicht = FXCollections.observableArrayList(); - private FilteredList stationsUebersichtsItemFilteredList = new FilteredList(stationsUebersicht, + private final ObservableList stationsUebersicht = FXCollections.observableArrayList(); + private final FilteredList stationsUebersichtsItemFilteredList = new FilteredList(stationsUebersicht, item -> item.getStationEntlassung() == null || item.getStationEntlassung().isAfter(LocalDate.now())); private Task loadStationsHistorieTask = null; diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/SettingsController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/SettingsController.java index 1814441..5de8a58 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/SettingsController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/SettingsController.java @@ -30,7 +30,7 @@ public class SettingsController { /** * A pointer to the applications main controller */ - private MainController mainController; + private final MainController mainController; /** * The button that for saving the data in the text fields. */ @@ -61,7 +61,7 @@ public class SettingsController { * @param ip The string to be validated. * @return true if ip is a valid ip address, otherwise false */ - public static boolean validateIpString(final String ip) { + private static boolean validateIpString(final String ip) { return PATTERN.matcher(ip).matches(); } diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java index 8ddd80e..4978748 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java @@ -31,7 +31,7 @@ import java.util.stream.Collectors; */ public class StationsHistorieController { - private MainController mainController; + private final MainController mainController; @FXML private GridPane fields; @@ -51,7 +51,7 @@ public class StationsHistorieController { private ComboBox cmbStation; @FXML private ComboBox cmbAbteilung; - private SimpleObjectProperty> stationsHistorie = + private final SimpleObjectProperty> stationsHistorie = new SimpleObjectProperty<>(); @@ -59,7 +59,7 @@ public class StationsHistorieController { * Definition of the controllers states. */ public enum State { - CREATE, EDIT, VIEW; + CREATE, EDIT, VIEW } /** diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/UntersuchungenController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/UntersuchungenController.java index fb40347..4fa02f9 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/UntersuchungenController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/UntersuchungenController.java @@ -31,11 +31,11 @@ public class UntersuchungenController { /** * The list of examinations that is shown in the views that belong to the controller. */ - private SimpleObjectProperty> untersuchungen = new SimpleObjectProperty<>(); + private final SimpleObjectProperty> untersuchungen = new SimpleObjectProperty<>(); /** * A pointer to the main controller. */ - private MainController mainController; + private final MainController mainController; @FXML private Button btnUntsCancel, btnUntsCreate, btnUntsSave, btnUntsAbort; @FXML