| @@ -23,7 +23,7 @@ import javafx.scene.layout.GridPane; | |||||
| */ | */ | ||||
| public class DiagnoseController { | public class DiagnoseController { | ||||
| private SimpleObjectProperty<ObservableList<Diagnose>> diagnosen = new SimpleObjectProperty<>(); | |||||
| private final SimpleObjectProperty<ObservableList<Diagnose>> diagnosen = new SimpleObjectProperty<>(); | |||||
| /** | /** | ||||
| * Controller state definitions | * Controller state definitions | ||||
| @@ -203,7 +203,7 @@ public class DiagnoseController { | |||||
| * EventHandler for the {@link #btnDiagCreate}. | * EventHandler for the {@link #btnDiagCreate}. | ||||
| */ | */ | ||||
| @FXML | @FXML | ||||
| void clickedDiagCreate() { | |||||
| private void clickedDiagCreate() { | |||||
| this.state.set(State.CREATE); | this.state.set(State.CREATE); | ||||
| } | } | ||||
| @@ -211,7 +211,7 @@ public class DiagnoseController { | |||||
| * EventHandler for the {@link #btnDiagCancel}. | * EventHandler for the {@link #btnDiagCancel}. | ||||
| */ | */ | ||||
| @FXML | @FXML | ||||
| void clickedDiagCancel() { | |||||
| private void clickedDiagCancel() { | |||||
| } | } | ||||
| @@ -33,7 +33,7 @@ public class FallController { | |||||
| * Controllers current state. | * Controllers current state. | ||||
| */ | */ | ||||
| private final SimpleObjectProperty<State> state = new SimpleObjectProperty<>(State.VIEW); | private final SimpleObjectProperty<State> state = new SimpleObjectProperty<>(State.VIEW); | ||||
| private MainController mainController; | |||||
| private final MainController mainController; | |||||
| @FXML | @FXML | ||||
| private DateTimePicker dtTmAufnahme, dtTmEntlassung; | private DateTimePicker dtTmAufnahme, dtTmEntlassung; | ||||
| @FXML | @FXML | ||||
| @@ -248,7 +248,7 @@ public class FallController { | |||||
| /** | /** | ||||
| * Toggle controller state to edit | * Toggle controller state to edit | ||||
| */ | */ | ||||
| public void editFall() { | |||||
| private void editFall() { | |||||
| this.state.set(State.EDIT); | this.state.set(State.EDIT); | ||||
| } | } | ||||
| @@ -75,7 +75,7 @@ public class LogController { | |||||
| //Change cell factory cuz we need scrollable fields | //Change cell factory cuz we need scrollable fields | ||||
| colLogMessage.setCellFactory(column -> | colLogMessage.setCellFactory(column -> | ||||
| new TableCell<HL7LogEntry, String>() { | new TableCell<HL7LogEntry, String>() { | ||||
| private TextArea textArea = new TextArea(); | |||||
| private final TextArea textArea = new TextArea(); | |||||
| { | { | ||||
| textArea.setEditable(false); | textArea.setEditable(false); | ||||
| @@ -27,14 +27,14 @@ public class MainController { | |||||
| /** | /** | ||||
| * The subcontroller instances | * 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; | |||||
| /** | /** | ||||
| @@ -23,7 +23,7 @@ public class MessageController { | |||||
| /** | /** | ||||
| * The superior controller | * The superior controller | ||||
| */ | */ | ||||
| final MainController mainController; | |||||
| private final MainController mainController; | |||||
| /** | /** | ||||
| * The list of unread messages | * The list of unread messages | ||||
| @@ -25,7 +25,7 @@ public class PatientEditorController { | |||||
| /** | /** | ||||
| * The superior controller | * The superior controller | ||||
| */ | */ | ||||
| private MainController mainController; | |||||
| private final MainController mainController; | |||||
| @FXML | @FXML | ||||
| private Label patChangeTime, patChanger, patCreator, patCreateTime; | private Label patChangeTime, patChanger, patCreator, patCreateTime; | ||||
| @@ -73,8 +73,8 @@ public class PatientTablesController { | |||||
| @FXML | @FXML | ||||
| private Tab stationOverviewTab, patientOverviewTab; | private Tab stationOverviewTab, patientOverviewTab; | ||||
| private ObservableList<StationsUebersichtsItem> stationsUebersicht = FXCollections.observableArrayList(); | |||||
| private FilteredList<StationsUebersichtsItem> stationsUebersichtsItemFilteredList = new FilteredList<StationsUebersichtsItem>(stationsUebersicht, | |||||
| private final ObservableList<StationsUebersichtsItem> stationsUebersicht = FXCollections.observableArrayList(); | |||||
| private final FilteredList<StationsUebersichtsItem> stationsUebersichtsItemFilteredList = new FilteredList<StationsUebersichtsItem>(stationsUebersicht, | |||||
| item -> item.getStationEntlassung() == null || item.getStationEntlassung().isAfter(LocalDate.now())); | item -> item.getStationEntlassung() == null || item.getStationEntlassung().isAfter(LocalDate.now())); | ||||
| private Task loadStationsHistorieTask = null; | private Task loadStationsHistorieTask = null; | ||||
| @@ -30,7 +30,7 @@ public class SettingsController { | |||||
| /** | /** | ||||
| * A pointer to the applications main controller | * 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. | * 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. | * @param ip The string to be validated. | ||||
| * @return true if ip is a valid ip address, otherwise false | * @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(); | return PATTERN.matcher(ip).matches(); | ||||
| } | } | ||||
| @@ -31,7 +31,7 @@ import java.util.stream.Collectors; | |||||
| */ | */ | ||||
| public class StationsHistorieController { | public class StationsHistorieController { | ||||
| private MainController mainController; | |||||
| private final MainController mainController; | |||||
| @FXML | @FXML | ||||
| private GridPane fields; | private GridPane fields; | ||||
| @@ -51,7 +51,7 @@ public class StationsHistorieController { | |||||
| private ComboBox<Station> cmbStation; | private ComboBox<Station> cmbStation; | ||||
| @FXML | @FXML | ||||
| private ComboBox<String> cmbAbteilung; | private ComboBox<String> cmbAbteilung; | ||||
| private SimpleObjectProperty<ObservableList<StationsHistorie>> stationsHistorie = | |||||
| private final SimpleObjectProperty<ObservableList<StationsHistorie>> stationsHistorie = | |||||
| new SimpleObjectProperty<>(); | new SimpleObjectProperty<>(); | ||||
| @@ -59,7 +59,7 @@ public class StationsHistorieController { | |||||
| * Definition of the controllers states. | * Definition of the controllers states. | ||||
| */ | */ | ||||
| public enum State { | public enum State { | ||||
| CREATE, EDIT, VIEW; | |||||
| CREATE, EDIT, VIEW | |||||
| } | } | ||||
| /** | /** | ||||
| @@ -31,11 +31,11 @@ public class UntersuchungenController { | |||||
| /** | /** | ||||
| * The list of examinations that is shown in the views that belong to the controller. | * The list of examinations that is shown in the views that belong to the controller. | ||||
| */ | */ | ||||
| private SimpleObjectProperty<ObservableList<Untersuchung>> untersuchungen = new SimpleObjectProperty<>(); | |||||
| private final SimpleObjectProperty<ObservableList<Untersuchung>> untersuchungen = new SimpleObjectProperty<>(); | |||||
| /** | /** | ||||
| * A pointer to the main controller. | * A pointer to the main controller. | ||||
| */ | */ | ||||
| private MainController mainController; | |||||
| private final MainController mainController; | |||||
| @FXML | @FXML | ||||
| private Button btnUntsCancel, btnUntsCreate, btnUntsSave, btnUntsAbort; | private Button btnUntsCancel, btnUntsCreate, btnUntsSave, btnUntsAbort; | ||||
| @FXML | @FXML | ||||