Skip to content

Commit e8a85b5

Browse files
mplieskemplieske
committed
made more instances either public static final or private with getter (some instances hab setters also)
1 parent 145983f commit e8a85b5

File tree

6 files changed

+51
-40
lines changed

6 files changed

+51
-40
lines changed

‎src/main/java/de/doubleslash/keeptime/Main.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ public void start(final Stage primaryStage) throws Exception {
102102
model.getProjectRepository().save(Model.DEFAULT_PROJECT);
103103
}
104104

105-
model.allProjects.addAll(projects);
106-
Model.AVAILABLE_PROJECTS
107-
.addAll(model.allProjects.stream().filter(Project::isEnabled).collect(Collectors.toList()));
105+
model.getAllProjects().addAll(projects);
106+
model.getAvailableProjects()
107+
.addAll(model.getAllProjects().stream().filter(Project::isEnabled).collect(Collectors.toList()));
108108

109109
// set default project
110110
final Optional<Project> findAny = projects.stream().filter(p -> p.isDefault()).findAny();

‎src/main/java/de/doubleslash/keeptime/controller/Controller.java‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void changeProject(final Project newProject) {
4545
public void changeProject(final Project newProject, final long minusSeconds) {
4646
// TODO consider day change (clean workRepo, ...)
4747

48-
final Work currentWork = model.activeWorkItem.get();
48+
final Work currentWork = Model.activeWorkItem.get();
4949

5050
final LocalDate dateNow = dateProvider.dateNow();
5151
final LocalDateTime now = dateProvider.dateTimeNow().minusSeconds(minusSeconds);
@@ -73,17 +73,17 @@ public void changeProject(final Project newProject, final long minusSeconds) {
7373
model.getPastWorkItems().removeIf(w -> !dateNow.isEqual(w.getCreationDate()));
7474
log.debug("Removed '{}' work items from past work items.", sizeBefore - model.getPastWorkItems().size());
7575
}
76-
model.activeWorkItem.set(work);
76+
Model.activeWorkItem.set(work);
7777
}
7878

7979
public void addNewProject(final String projectName, final boolean isWork, final Color projectColor,
8080
final int index) {
8181
final Project project = new Project(projectName, projectColor, isWork, index, false);
82-
model.allProjects.add(project);
83-
Model.AVAILABLE_PROJECTS.add(project);
82+
model.getAllProjects().add(project);
83+
model.getAvailableProjects().add(project);
8484

85-
final List<Project> changedProjects = resortProjectIndexes(Model.AVAILABLE_PROJECTS, project,
86-
Model.AVAILABLE_PROJECTS.size(), index);
85+
final List<Project> changedProjects = resortProjectIndexes(model.getAvailableProjects(), project,
86+
model.getAvailableProjects().size(), index);
8787
changedProjects.add(project);
8888
model.getProjectRepository().saveAll(changedProjects);
8989
}
@@ -131,9 +131,10 @@ public void deleteProject(final Project p) {
131131
p.setEnabled(false); // TODO or can we remove the project? but work references??
132132
p.setIndex(-1);
133133

134-
Model.AVAILABLE_PROJECTS.remove(p);
134+
model.getAvailableProjects().remove(p);
135135

136-
final List<Project> changedProjects = adaptProjectIndexesAfterRemoving(Model.AVAILABLE_PROJECTS, indexToRemove);
136+
final List<Project> changedProjects = adaptProjectIndexesAfterRemoving(model.getAvailableProjects(),
137+
indexToRemove);
137138

138139
changedProjects.add(p);
139140
model.getProjectRepository().saveAll(changedProjects);
@@ -149,7 +150,7 @@ public void editProject(final Project p, final String newName, final Color newCo
149150
final int oldIndex = p.getIndex();
150151
p.setIndex(newIndex);
151152

152-
final List<Project> changedProjects = resortProjectIndexes(Model.AVAILABLE_PROJECTS, p, oldIndex, newIndex);
153+
final List<Project> changedProjects = resortProjectIndexes(model.getAvailableProjects(), p, oldIndex, newIndex);
153154
changedProjects.add(p);
154155

155156
// save all projects which changed index
@@ -225,7 +226,7 @@ List<Project> adaptProjectIndexesAfterRemoving(final List<Project> originalList,
225226
}
226227

227228
public void setComment(final String notes) {
228-
final Work work = model.activeWorkItem.get();
229+
final Work work = Model.activeWorkItem.get();
229230
work.setNotes(notes);
230231
// TODO when to save to repo?
231232
}
@@ -238,8 +239,8 @@ public long calcTodaysWorkSeconds() {
238239
return model.getPastWorkItems().stream().filter(work -> {
239240
final Project project = work.getProject();
240241
// find up to date reference to project
241-
final Optional<Project> optionalProject = model.allProjects.stream().filter(p -> p.getId() == project.getId())
242-
.findAny();
242+
final Optional<Project> optionalProject = model.getAllProjects().stream()
243+
.filter(p -> p.getId() == project.getId()).findAny();
243244
if (optionalProject.isPresent()) {
244245
return optionalProject.get().isWork();
245246
}
@@ -257,6 +258,6 @@ public long calcTodaysSeconds() {
257258
}
258259

259260
public ObservableList<Project> getAvailableProjects() {
260-
return Model.AVAILABLE_PROJECTS;
261+
return model.getAvailableProjects();
261262
}
262263
}

‎src/main/java/de/doubleslash/keeptime/model/Model.java‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ public Model(final ProjectRepository projectRepository, final WorkRepository wor
4141
public static final Project DEFAULT_PROJECT = new Project("Idle", Color.ORANGE, false, 0, true);
4242
private Project idleProject = DEFAULT_PROJECT;
4343

44-
public static final ObservableList<Project> AVAILABLE_PROJECTS = FXCollections.observableArrayList();
45-
private final SortedList<Project> sortedAvailableProjects = new SortedList<>(AVAILABLE_PROJECTS,
44+
private final ObservableList<Project> availableProjects = FXCollections.observableArrayList();
45+
private final SortedList<Project> sortedAvailableProjects = new SortedList<>(availableProjects,
4646
Comparator.comparing(Project::getIndex));
47-
public ObservableList<Project> allProjects = FXCollections.observableArrayList();
47+
private ObservableList<Project> allProjects = FXCollections.observableArrayList();
4848

4949
protected static final ObservableList<Work> pastWorkItems = FXCollections.observableArrayList();
50-
public ObjectProperty<Work> activeWorkItem = new SimpleObjectProperty<>();
50+
public static final ObjectProperty<Work> activeWorkItem = new SimpleObjectProperty<>();
5151

5252
public static final long NEEDED_WORK_SECONDS = 60 * 60 * 8; // 8 hours
5353

@@ -79,6 +79,10 @@ public void setIdleProject(final Project idleProject) {
7979
this.idleProject = idleProject;
8080
}
8181

82+
public void setAllProjects(final ObservableList<Project> allProjects) {
83+
this.allProjects = allProjects;
84+
}
85+
8286
public WorkRepository getWorkRepository() {
8387
return workRepository;
8488
}
@@ -102,4 +106,12 @@ public ObservableList<Work> getPastWorkItems() {
102106
public Project getIdleProject() {
103107
return idleProject;
104108
}
109+
110+
public ObservableList<Project> getAvailableProjects() {
111+
return availableProjects;
112+
}
113+
114+
public ObservableList<Project> getAllProjects() {
115+
return allProjects;
116+
}
105117
}

‎src/main/java/de/doubleslash/keeptime/view/SettingsController.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ public class SettingsController {
6363
private Label versionLabel;
6464

6565
private final Logger log = LoggerFactory.getLogger(this.getClass());
66-
67-
private Model model;
6866
private Controller controller;
6967
private Stage thisStage;
7068
private static final String INPUT_FILE = "config.xml";
@@ -140,8 +138,7 @@ private void initialize() {
140138

141139
}
142140

143-
public void setModelAndController(final Model model, final Controller controller) {
144-
this.model = model;
141+
public void setController(final Controller controller) {
145142
this.controller = controller;
146143

147144
update();

‎src/main/java/de/doubleslash/keeptime/view/ViewController.java‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ private void initialize() {
245245
fontColorProperty.addListener((a, b, c) -> textAreaColorRunnable.run());
246246
textAreaColorRunnable.run();
247247

248-
projectSelectionNodeMap = new HashMap<>(Model.AVAILABLE_PROJECTS.size());
248+
projectSelectionNodeMap = new HashMap<>(model.getAvailableProjects().size());
249249

250250
for (final Project project : model.getSortedAvailableProjects()) {
251251
if (project.isEnabled()) {
@@ -254,12 +254,13 @@ private void initialize() {
254254
}
255255
}
256256

257-
model.activeWorkItem.addListener((a, b, c) -> {
257+
Model.activeWorkItem.addListener((a, b, c) -> {
258258
updateProjectView();
259259
textArea.setText("");
260260
});
261261

262-
Model.AVAILABLE_PROJECTS.addListener((ListChangeListener<Project>) lis -> setUpAvailableProjectsListener(lis));
262+
model.getAvailableProjects()
263+
.addListener((ListChangeListener<Project>) lis -> setUpAvailableProjectsListener(lis));
263264

264265
Model.DEFAULT_BACKGROUND_COLOR.addListener((a, b, c) -> updateMainBackgroundColor.run());
265266
Model.HOVER_BACKGROUND_COLOR.addListener((a, b, c) -> updateMainBackgroundColor.run());
@@ -353,7 +354,7 @@ private void setUpAvailableProjectsListener(final Change<? extends Project> lis)
353354
final List<? extends Project> removedSubList = lis.getRemoved();
354355
for (final Project project : removedSubList) {
355356
// change to idle if removed project was active
356-
if (project == model.activeWorkItem.get().getProject()) {
357+
if (project == Model.activeWorkItem.get().getProject()) {
357358
changeProject(model.getIdleProject(), 0);
358359
}
359360
final Node remove = projectSelectionNodeMap.remove(project);
@@ -365,10 +366,10 @@ private void setUpAvailableProjectsListener(final Change<? extends Project> lis)
365366

366367
private long doIntervalRegisterCallBack() {
367368
final LocalDateTime now = LocalDateTime.now();
368-
model.activeWorkItem.get().setEndTime(now); // TODO not good to change model
369+
Model.activeWorkItem.get().setEndTime(now); // TODO not good to change model
369370

370371
final long currentWorkSeconds = Duration
371-
.between(model.activeWorkItem.get().getStartTime(), model.activeWorkItem.get().getEndTime()).getSeconds();
372+
.between(Model.activeWorkItem.get().getStartTime(), Model.activeWorkItem.get().getEndTime()).getSeconds();
372373
activeWorkSecondsProperty.set(currentWorkSeconds);
373374
final long todayWorkingSeconds = controller.calcTodaysWorkSeconds();
374375
final long todaySeconds = controller.calcTodaysSeconds();
@@ -438,7 +439,7 @@ private void loadSubStages() {
438439
final FXMLLoader fxmlLoader2 = createFXMLLoader(RESOURCE.FXML_SETTINGS);
439440
final Parent root1 = fxmlLoader2.load();
440441
settingsController = fxmlLoader2.getController();
441-
settingsController.setModelAndController(model, controller);
442+
settingsController.setController(controller);
442443
settingsStage = new Stage();
443444
settingsController.setStage(settingsStage);
444445
settingsStage.initModality(Modality.APPLICATION_MODAL);
@@ -543,7 +544,7 @@ private Node addProjectToProjectList(final Project p) {
543544

544545
grid.add(new Label("New time distribution"), 0, gridRow);
545546
gridRow++;
546-
grid.add(new Label("Active project duration: " + model.activeWorkItem.get().getProject().getName()), 0,
547+
grid.add(new Label("Active project duration: " + Model.activeWorkItem.get().getProject().getName()), 0,
547548
gridRow);
548549
final Label currentProjectTimeLabel = new Label(TIME_ZERO);
549550
grid.add(currentProjectTimeLabel, 1, gridRow);
@@ -569,7 +570,7 @@ private Node addProjectToProjectList(final Project p) {
569570
currentProjectTimeLabel.setText(DateFormatter.secondsToHHMMSS(secondsActiveWork));
570571
newProjectTimeLabel.setText(DateFormatter.secondsToHHMMSS(secondsNewWork));
571572
newEndTimeLabel.setText(
572-
DateFormatter.toTimeString(model.activeWorkItem.get().getEndTime().minusSeconds(secondsOffset)));
573+
DateFormatter.toTimeString(Model.activeWorkItem.get().getEndTime().minusSeconds(secondsOffset)));
573574
};
574575
activeWorkSecondsProperty.addListener((obs, oldValue, newValue) -> updateLabelsRunnable.run());
575576
slider.valueProperty().addListener((obs, oldValue, newValue) -> updateLabelsRunnable.run());
@@ -704,7 +705,7 @@ private GridPane setUpEditProjectGridPane(final Project p) {
704705
final GridPane grid = setUpGridPane(p.getName(), p.getColor(), p.isWork());
705706

706707
final Spinner<Integer> indexSpinner = new Spinner<>();
707-
final int availableProjectAmount = Model.AVAILABLE_PROJECTS.size();
708+
final int availableProjectAmount = model.getAvailableProjects().size();
708709
indexSpinner.setValueFactory(new IntegerSpinnerValueFactory(0, availableProjectAmount - 1, p.getIndex()));
709710
grid.add(indexSpinner, 1, 3);
710711

@@ -716,7 +717,7 @@ private GridPane setUpAddNewProjectGridPane(final String projectName, final Colo
716717
final GridPane grid = setUpGridPane(projectName, projectColor, isWork);
717718

718719
final Spinner<Integer> indexSpinner = new Spinner<>();
719-
final int availableProjectAmount = Model.AVAILABLE_PROJECTS.size();
720+
final int availableProjectAmount = model.getAvailableProjects().size();
720721
indexSpinner.setValueFactory(new IntegerSpinnerValueFactory(0, availableProjectAmount, availableProjectAmount));
721722
grid.add(indexSpinner, 1, 3);
722723

@@ -782,7 +783,7 @@ private void updateTaskbarIcon(final long currentWorkSeconds) {
782783
final GraphicsContext gcIcon = taskbarCanvas.getGraphicsContext2D();
783784

784785
gcIcon.clearRect(0, 0, taskbarCanvas.getWidth(), taskbarCanvas.getHeight());
785-
gcIcon.setFill(model.activeWorkItem.get().getProject().getColor());
786+
gcIcon.setFill(Model.activeWorkItem.get().getProject().getColor());
786787
gcIcon.fillRect(1, 27, 31, 5);
787788

788789
gcIcon.setStroke(Model.TASK_BAR_COLOR.get());
@@ -809,7 +810,7 @@ private void updateTaskbarIcon(final long currentWorkSeconds) {
809810
}
810811

811812
private void updateProjectView() {
812-
final Project project = model.activeWorkItem.get().getProject();
813+
final Project project = Model.activeWorkItem.get().getProject();
813814
currentProjectLabel.setText(project.getName());
814815
currentProjectLabel.setUnderline(project.isWork());
815816
final Circle circle = new Circle(4);

‎src/main/java/de/doubleslash/keeptime/viewpopup/ViewControllerPopup.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ private void changeProject(final Project item) {
4747
log.info(info);
4848

4949
// ask for a note for the current project
50-
final TextInputDialog dialog = new TextInputDialog(model.activeWorkItem.get().getNotes());
50+
final TextInputDialog dialog = new TextInputDialog(Model.activeWorkItem.get().getNotes());
5151
dialog.setTitle("Note for current project");
5252
dialog.setHeaderText(
53-
"Add a note for '" + model.activeWorkItem.get().getProject().getName() + "' before changing project?");
53+
"Add a note for '" + Model.activeWorkItem.get().getProject().getName() + "' before changing project?");
5454
dialog.setContentText("Note: ");
5555

5656
this.stage.setAlwaysOnTop(false);
@@ -149,7 +149,7 @@ protected void updateItem(final Project project, final boolean empty) {
149149
} else {
150150
setOnMouseClicked(ev -> changeProject(project));
151151

152-
final boolean isActiveProject = project == model.activeWorkItem.get().getProject();
152+
final boolean isActiveProject = project == Model.activeWorkItem.get().getProject();
153153
setText((isActiveProject ? "* " : "") + project.getName());
154154
setTextFill(project.getColor());
155155
setUnderline(project.isWork());

0 commit comments

Comments
 (0)