Skip to content

Commit 145983f

Browse files
mplieskemplieske
committed
changed some instances to public static final
1 parent d01b8ef commit 145983f

File tree

5 files changed

+66
-55
lines changed

5 files changed

+66
-55
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,25 +69,25 @@ public void start(final Stage primaryStage) throws Exception {
6969
settings = new Settings();
7070
settings.setTaskBarColor(Model.TASK_BAR_COLOR.get());
7171

72-
settings.setDefaultBackgroundColor(model.defaultBackgroundColor.get());
73-
settings.setDefaultFontColor(model.defaultFontColor.get());
72+
settings.setDefaultBackgroundColor(Model.DEFAULT_BACKGROUND_COLOR.get());
73+
settings.setDefaultFontColor(Model.DEFAULT_FONT_COLOR.get());
7474

75-
settings.setHoverBackgroundColor(model.hoverBackgroundColor.get());
76-
settings.setHoverFontColor(model.hoverFontColor.get());
75+
settings.setHoverBackgroundColor(Model.HOVER_BACKGROUND_COLOR.get());
76+
settings.setHoverFontColor(Model.HOVER_FONT_COLOR.get());
7777
settings.setUseHotkey(false);
7878
settings.setDisplayProjectsRight(true);
7979
model.getSettingsRepository().save(settings);
8080
} else {
8181
settings = settingsList.get(0);
8282
}
8383

84-
model.defaultBackgroundColor.set(settings.getDefaultBackgroundColor());
85-
model.defaultFontColor.set(settings.getDefaultFontColor());
86-
model.hoverBackgroundColor.set(settings.getHoverBackgroundColor());
87-
model.hoverFontColor.set(settings.getHoverFontColor());
84+
Model.DEFAULT_BACKGROUND_COLOR.set(settings.getDefaultBackgroundColor());
85+
Model.DEFAULT_FONT_COLOR.set(settings.getDefaultFontColor());
86+
Model.HOVER_BACKGROUND_COLOR.set(settings.getHoverBackgroundColor());
87+
Model.HOVER_FONT_COLOR.set(settings.getHoverFontColor());
8888
Model.TASK_BAR_COLOR.set(settings.getTaskBarColor());
8989
Model.USE_HOTKEY.set(settings.isUseHotkey());
90-
model.displayProjectsRight.set(settings.isDisplayProjectsRight());
90+
Model.DISPLAY_PROJECTS_RIGHT.set(settings.isDisplayProjectsRight());
9191

9292
final List<Work> todaysWorkItems = model.getWorkRepository().findByCreationDate(LocalDate.now());
9393
log.info("Found {} past work items", todaysWorkItems.size());
@@ -103,14 +103,14 @@ public void start(final Stage primaryStage) throws Exception {
103103
}
104104

105105
model.allProjects.addAll(projects);
106-
model.availableProjects
106+
Model.AVAILABLE_PROJECTS
107107
.addAll(model.allProjects.stream().filter(Project::isEnabled).collect(Collectors.toList()));
108108

109109
// set default project
110110
final Optional<Project> findAny = projects.stream().filter(p -> p.isDefault()).findAny();
111111
if (findAny.isPresent()) {
112-
Model.idleProject = findAny.get();
113-
log.debug("Using project '{}' as default project.", Model.idleProject);
112+
model.setIdleProject(findAny.get());
113+
log.debug("Using project '{}' as default project.", model.getIdleProject());
114114
}
115115

116116
primaryStage.setOnHiding(we -> {

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ public void addNewProject(final String projectName, final boolean isWork, final
8080
final int index) {
8181
final Project project = new Project(projectName, projectColor, isWork, index, false);
8282
model.allProjects.add(project);
83-
model.availableProjects.add(project);
83+
Model.AVAILABLE_PROJECTS.add(project);
8484

85-
final List<Project> changedProjects = resortProjectIndexes(model.availableProjects, project,
86-
model.availableProjects.size(), index);
85+
final List<Project> changedProjects = resortProjectIndexes(Model.AVAILABLE_PROJECTS, project,
86+
Model.AVAILABLE_PROJECTS.size(), index);
8787
changedProjects.add(project);
8888
model.getProjectRepository().saveAll(changedProjects);
8989
}
@@ -105,20 +105,20 @@ public void updateSettings(final Color hoverBackgroundColor, final Color hoverFo
105105

106106
model.getSettingsRepository().save(settings);
107107

108-
model.defaultBackgroundColor.set(settings.getDefaultBackgroundColor());
109-
model.defaultFontColor.set(settings.getDefaultFontColor());
110-
model.hoverBackgroundColor.set(settings.getHoverBackgroundColor());
111-
model.hoverFontColor.set(settings.getHoverFontColor());
108+
Model.DEFAULT_BACKGROUND_COLOR.set(settings.getDefaultBackgroundColor());
109+
Model.DEFAULT_FONT_COLOR.set(settings.getDefaultFontColor());
110+
Model.HOVER_BACKGROUND_COLOR.set(settings.getHoverBackgroundColor());
111+
Model.HOVER_FONT_COLOR.set(settings.getHoverFontColor());
112112
Model.TASK_BAR_COLOR.set(settings.getTaskBarColor());
113113
Model.USE_HOTKEY.set(settings.isUseHotkey());
114-
model.displayProjectsRight.set(settings.isDisplayProjectsRight());
114+
Model.DISPLAY_PROJECTS_RIGHT.set(settings.isDisplayProjectsRight());
115115
}
116116

117117
@PreDestroy
118118
public void shutdown() {
119119
// XXX Auto-generated method stub
120120
log.info("Controller shutdown");
121-
changeProject(model.idleProject, 0); // TODO get notes from view
121+
changeProject(model.getIdleProject(), 0); // TODO get notes from view
122122
}
123123

124124
public void deleteProject(final Project p) {
@@ -131,9 +131,9 @@ 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.availableProjects.remove(p);
134+
Model.AVAILABLE_PROJECTS.remove(p);
135135

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

138138
changedProjects.add(p);
139139
model.getProjectRepository().saveAll(changedProjects);
@@ -149,7 +149,7 @@ public void editProject(final Project p, final String newName, final Color newCo
149149
final int oldIndex = p.getIndex();
150150
p.setIndex(newIndex);
151151

152-
final List<Project> changedProjects = resortProjectIndexes(model.availableProjects, p, oldIndex, newIndex);
152+
final List<Project> changedProjects = resortProjectIndexes(Model.AVAILABLE_PROJECTS, p, oldIndex, newIndex);
153153
changedProjects.add(p);
154154

155155
// save all projects which changed index
@@ -257,6 +257,6 @@ public long calcTodaysSeconds() {
257257
}
258258

259259
public ObservableList<Project> getAvailableProjects() {
260-
return this.model.availableProjects;
260+
return Model.AVAILABLE_PROJECTS;
261261
}
262262
}

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

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ public Model(final ProjectRepository projectRepository, final WorkRepository wor
3939
public static final Color ORIGINAL_TASK_BAR_FONT_COLOR = Color.BLACK;
4040

4141
public static final Project DEFAULT_PROJECT = new Project("Idle", Color.ORANGE, false, 0, true);
42-
public static Project idleProject = DEFAULT_PROJECT;
42+
private Project idleProject = DEFAULT_PROJECT;
4343

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

@@ -53,12 +53,15 @@ public Model(final ProjectRepository projectRepository, final WorkRepository wor
5353

5454
public static final ObjectProperty<Color> TASK_BAR_COLOR = new SimpleObjectProperty<>(ORIGINAL_TASK_BAR_FONT_COLOR);
5555

56-
public ObjectProperty<Color> hoverBackgroundColor = new SimpleObjectProperty<>(ORIGINAL_HOVER_BACKGROUND_COLOR);
57-
public ObjectProperty<Color> hoverFontColor = new SimpleObjectProperty<>(ORIGINAL_HOVER_Font_COLOR);
58-
public ObjectProperty<Color> defaultBackgroundColor = new SimpleObjectProperty<>(ORIGINAL_DEFAULT_BACKGROUND_COLOR);
59-
public ObjectProperty<Color> defaultFontColor = new SimpleObjectProperty<>(ORIGINAL_DEFAULT_FONT_COLOR);
56+
public static final ObjectProperty<Color> HOVER_BACKGROUND_COLOR = new SimpleObjectProperty<>(
57+
ORIGINAL_HOVER_BACKGROUND_COLOR);
58+
public static final ObjectProperty<Color> HOVER_FONT_COLOR = new SimpleObjectProperty<>(ORIGINAL_HOVER_Font_COLOR);
59+
public static final ObjectProperty<Color> DEFAULT_BACKGROUND_COLOR = new SimpleObjectProperty<>(
60+
ORIGINAL_DEFAULT_BACKGROUND_COLOR);
61+
public static final ObjectProperty<Color> DEFAULT_FONT_COLOR = new SimpleObjectProperty<>(
62+
ORIGINAL_DEFAULT_FONT_COLOR);
6063
public static final ObjectProperty<Boolean> USE_HOTKEY = new SimpleObjectProperty<>(false);
61-
public ObjectProperty<Boolean> displayProjectsRight = new SimpleObjectProperty<>(false);
64+
public static final ObjectProperty<Boolean> DISPLAY_PROJECTS_RIGHT = new SimpleObjectProperty<>(false);
6265

6366
public void setWorkRepository(final WorkRepository workRepository) {
6467
this.workRepository = workRepository;
@@ -72,6 +75,10 @@ public void setSettingsRepository(final SettingsRepository settingsRepository) {
7275
this.settingsRepository = settingsRepository;
7376
}
7477

78+
public void setIdleProject(final Project idleProject) {
79+
this.idleProject = idleProject;
80+
}
81+
7582
public WorkRepository getWorkRepository() {
7683
return workRepository;
7784
}
@@ -91,4 +98,8 @@ public SettingsRepository getSettingsRepository() {
9198
public ObservableList<Work> getPastWorkItems() {
9299
return pastWorkItems;
93100
}
101+
102+
public Project getIdleProject() {
103+
return idleProject;
104+
}
94105
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,16 +148,16 @@ public void setModelAndController(final Model model, final Controller controller
148148
}
149149

150150
void update() {
151-
hoverBackgroundColor.setValue(model.hoverBackgroundColor.get());
152-
hoverFontColor.setValue(model.hoverFontColor.get());
151+
hoverBackgroundColor.setValue(Model.HOVER_BACKGROUND_COLOR.get());
152+
hoverFontColor.setValue(Model.HOVER_FONT_COLOR.get());
153153

154-
defaultBackgroundColor.setValue(model.defaultBackgroundColor.get());
155-
defaultFontColor.setValue(model.defaultFontColor.get());
154+
defaultBackgroundColor.setValue(Model.DEFAULT_BACKGROUND_COLOR.get());
155+
defaultFontColor.setValue(Model.DEFAULT_FONT_COLOR.get());
156156

157157
taskBarColor.setValue(Model.TASK_BAR_COLOR.get());
158158

159159
useHotkeyCheckBox.setSelected(Model.USE_HOTKEY.get());
160-
displayProjectsRightCheckBox.setSelected(model.displayProjectsRight.get());
160+
displayProjectsRightCheckBox.setSelected(Model.DISPLAY_PROJECTS_RIGHT.get());
161161
}
162162

163163
public void setStage(final Stage thisStage) {

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public void setController(final Controller controller, final Model model) {
144144
this.controller = controller;
145145
this.model = model;
146146

147-
changeProject(Model.idleProject, 0); // TODO initialize not here!
147+
changeProject(model.getIdleProject(), 0); // TODO initialize not here!
148148
updateProjectView();
149149
}
150150

@@ -209,22 +209,22 @@ private void initialize() {
209209

210210
Platform.runLater(() -> {
211211
loadSubStages();
212-
fontColorProperty.set(model.defaultFontColor.get());
212+
fontColorProperty.set(Model.DEFAULT_FONT_COLOR.get());
213213
fontColorProperty.bind(Bindings.createObjectBinding(() -> {
214214
if (mouseHoveringProperty.get()) {
215-
return model.hoverFontColor.get();
215+
return Model.HOVER_FONT_COLOR.get();
216216
} else {
217-
return model.defaultFontColor.get();
217+
return Model.DEFAULT_FONT_COLOR.get();
218218
}
219-
}, mouseHoveringProperty, model.defaultFontColor, model.hoverFontColor));
219+
}, mouseHoveringProperty, Model.DEFAULT_FONT_COLOR, Model.HOVER_FONT_COLOR));
220220

221221
bigTimeLabel.textFillProperty().bind(fontColorProperty);
222222
allTimeLabel.textFillProperty().bind(fontColorProperty);
223223
todayAllSeconds.textFillProperty().bind(fontColorProperty);
224224
currentProjectLabel.textFillProperty().bind(fontColorProperty);
225225

226226
final Runnable displayProjectRightRunnable = () -> {
227-
if (model.displayProjectsRight.get()) {
227+
if (Model.DISPLAY_PROJECTS_RIGHT.get()) {
228228
borderPane.setLeft(null);
229229
borderPane.setRight(projectsVBox);
230230
} else {
@@ -233,7 +233,7 @@ private void initialize() {
233233

234234
}
235235
};
236-
model.displayProjectsRight.addListener((a, oldValue, newValue) -> displayProjectRightRunnable.run());
236+
Model.DISPLAY_PROJECTS_RIGHT.addListener((a, oldValue, newValue) -> displayProjectRightRunnable.run());
237237
displayProjectRightRunnable.run();
238238

239239
// Setup textarea font color binding
@@ -245,7 +245,7 @@ private void initialize() {
245245
fontColorProperty.addListener((a, b, c) -> textAreaColorRunnable.run());
246246
textAreaColorRunnable.run();
247247

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

250250
for (final Project project : model.getSortedAvailableProjects()) {
251251
if (project.isEnabled()) {
@@ -259,10 +259,10 @@ private void initialize() {
259259
textArea.setText("");
260260
});
261261

262-
model.availableProjects.addListener((ListChangeListener<Project>) lis -> setUpAvailableProjectsListener(lis));
262+
Model.AVAILABLE_PROJECTS.addListener((ListChangeListener<Project>) lis -> setUpAvailableProjectsListener(lis));
263263

264-
model.defaultBackgroundColor.addListener((a, b, c) -> updateMainBackgroundColor.run());
265-
model.hoverBackgroundColor.addListener((a, b, c) -> updateMainBackgroundColor.run());
264+
Model.DEFAULT_BACKGROUND_COLOR.addListener((a, b, c) -> updateMainBackgroundColor.run());
265+
Model.HOVER_BACKGROUND_COLOR.addListener((a, b, c) -> updateMainBackgroundColor.run());
266266
updateMainBackgroundColor.run();
267267
});
268268

@@ -328,10 +328,10 @@ private void calendarClicked() {
328328
}
329329

330330
private void runUpdateMainBackgroundColor() {
331-
Color color = model.defaultBackgroundColor.get();
331+
Color color = Model.DEFAULT_BACKGROUND_COLOR.get();
332332
double opacity = 0;
333333
if (mouseHoveringProperty.get()) {
334-
color = model.hoverBackgroundColor.get();
334+
color = Model.HOVER_BACKGROUND_COLOR.get();
335335
opacity = .3;
336336
}
337337
String style = changeStyleAttribute(pane.getStyle(), "fx-background-color",
@@ -354,7 +354,7 @@ private void setUpAvailableProjectsListener(final Change<? extends Project> lis)
354354
for (final Project project : removedSubList) {
355355
// change to idle if removed project was active
356356
if (project == model.activeWorkItem.get().getProject()) {
357-
changeProject(Model.idleProject, 0);
357+
changeProject(model.getIdleProject(), 0);
358358
}
359359
final Node remove = projectSelectionNodeMap.remove(project);
360360
availableProjectVbox.getChildren().remove(remove);
@@ -414,7 +414,7 @@ private void setProjectWindowVisibleByMouseHover(final Boolean c) {
414414
final double afterWidth = mainStage.getWidth();
415415
projectsVBox.setVisible(c);
416416
final double offset = afterWidth - beforeWidth;
417-
if (!model.displayProjectsRight.get()) {
417+
if (!Model.DISPLAY_PROJECTS_RIGHT.get()) {
418418
// we only need to move the stage if the node on the left is hidden
419419
mainStage.setX(mainStage.getX() - offset);
420420
}
@@ -704,7 +704,7 @@ private GridPane setUpEditProjectGridPane(final Project p) {
704704
final GridPane grid = setUpGridPane(p.getName(), p.getColor(), p.isWork());
705705

706706
final Spinner<Integer> indexSpinner = new Spinner<>();
707-
final int availableProjectAmount = model.availableProjects.size();
707+
final int availableProjectAmount = Model.AVAILABLE_PROJECTS.size();
708708
indexSpinner.setValueFactory(new IntegerSpinnerValueFactory(0, availableProjectAmount - 1, p.getIndex()));
709709
grid.add(indexSpinner, 1, 3);
710710

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

718718
final Spinner<Integer> indexSpinner = new Spinner<>();
719-
final int availableProjectAmount = model.availableProjects.size();
719+
final int availableProjectAmount = Model.AVAILABLE_PROJECTS.size();
720720
indexSpinner.setValueFactory(new IntegerSpinnerValueFactory(0, availableProjectAmount, availableProjectAmount));
721721
grid.add(indexSpinner, 1, 3);
722722

0 commit comments

Comments
 (0)