Skip to content

Commit 8569a95

Browse files
ddamkeddamke
authored andcommitted
add better name for variables
1 parent 82b5318 commit 8569a95

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ private void readSettings() {
209209
model.screenSettings.screenHash.set(settings.getScreenHash());
210210
model.screenSettings.saveWindowPosition.set(settings.isSaveWindowPosition());
211211
model.remindIfNotesAreEmpty.set(settings.isRemindIfNotesAreEmpty());
212-
model.remindIfNotesAreEmptyIsWork.set(settings.isEmptyNoteReminderIsWork());
212+
model.remindIfNotesAreEmptyOnlyForWorkEntry.set(settings.isEmptyNoteReminderIsWork());
213213

214214
}
215215

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public void updateSettings(final Settings newValuedSettings) {
148148
model.screenSettings.proportionalY.set(settings.getWindowYProportion());
149149
model.screenSettings.screenHash.set(settings.getScreenHash());
150150
model.remindIfNotesAreEmpty.set(settings.isRemindIfNotesAreEmpty());
151-
model.remindIfNotesAreEmptyIsWork.set(settings.isEmptyNoteReminderIsWork());
151+
model.remindIfNotesAreEmptyOnlyForWorkEntry.set(settings.isEmptyNoteReminderIsWork());
152152
}
153153

154154
@PreDestroy
@@ -164,7 +164,7 @@ public void shutdown() {
164164
model.useHotkey.get(), model.displayProjectsRight.get(), model.hideProjectsOnMouseExit.get(),
165165
model.screenSettings.proportionalX.get(), model.screenSettings.proportionalY.get(),
166166
model.screenSettings.screenHash.get(), model.screenSettings.saveWindowPosition.get(),
167-
model.remindIfNotesAreEmpty.get(),model.remindIfNotesAreEmptyIsWork.get());
167+
model.remindIfNotesAreEmpty.get(),model.remindIfNotesAreEmptyOnlyForWorkEntry.get());
168168
updateSettings(newSettings);
169169
}
170170

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public Model(final ProjectRepository projectRepository, final WorkRepository wor
8282

8383
public final ObjectProperty<Boolean> remindIfNotesAreEmpty = new SimpleObjectProperty<>(false);
8484

85-
public final ObjectProperty<Boolean> remindIfNotesAreEmptyIsWork = new SimpleObjectProperty<>(false);
85+
public final ObjectProperty<Boolean> remindIfNotesAreEmptyOnlyForWorkEntry = new SimpleObjectProperty<>(false);
8686

8787
public final ScreenSettings screenSettings = new ScreenSettings();
8888

src/main/java/de/doubleslash/keeptime/view/ProjectsListViewController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ private void changeProject(final Project newProject, final long minusSeconds) {
170170
final Work currentWork = model.activeWorkItem.get();
171171
if (model.remindIfNotesAreEmpty.get() && currentWork.getNotes().isEmpty()) {
172172

173-
if (currentWork != null && (!model.remindIfNotesAreEmptyIsWork.get() || currentWork.getProject().isWork())) {
173+
if (currentWork != null && (!model.remindIfNotesAreEmptyOnlyForWorkEntry.get() || currentWork.getProject().isWork())) {
174174
if (showDialogNoNoteSelected(currentWork)) return;
175175
}
176176
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public class SettingsController {
9393
private CheckBox emptyNoteReminderCheckBox;
9494

9595
@FXML
96-
private CheckBox emptyNoteReminderCheckBoxIsWork;
96+
private CheckBox emptyNoteReminderOnlyForWorkEntryCheckBox;
9797

9898
@FXML
9999
private Button saveButton;
@@ -207,7 +207,7 @@ private void initialize() {
207207
useHotkeyCheckBox.isSelected(), displayProjectsRightCheckBox.isSelected(),
208208
hideProjectsOnMouseExitCheckBox.isSelected(), model.screenSettings.proportionalX.get(),
209209
model.screenSettings.proportionalY.get(), model.screenSettings.screenHash.get(),
210-
saveWindowPositionCheckBox.isSelected(), emptyNoteReminderCheckBox.isSelected(), emptyNoteReminderCheckBoxIsWork.isSelected()));
210+
saveWindowPositionCheckBox.isSelected(), emptyNoteReminderCheckBox.isSelected(), emptyNoteReminderOnlyForWorkEntryCheckBox.isSelected()));
211211
thisStage.close();
212212

213213
});
@@ -298,7 +298,7 @@ void update() {
298298
hideProjectsOnMouseExitCheckBox.setSelected(model.hideProjectsOnMouseExit.get());
299299
saveWindowPositionCheckBox.setSelected(model.screenSettings.saveWindowPosition.get());
300300
emptyNoteReminderCheckBox.setSelected(model.remindIfNotesAreEmpty.get());
301-
emptyNoteReminderCheckBoxIsWork.setSelected(model.remindIfNotesAreEmptyIsWork.get());
301+
emptyNoteReminderOnlyForWorkEntryCheckBox.setSelected(model.remindIfNotesAreEmptyOnlyForWorkEntry.get());
302302
}
303303

304304
public void setStage(final Stage thisStage) {

src/main/resources/layouts/settings.fxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@
300300
</HBox>
301301
<HBox spacing="10.0">
302302
<children>
303-
<CheckBox fx:id="emptyNoteReminderCheckBoxIsWork" mnemonicParsing="false" text="Ask for notes when switching from project marked as work (if empty)" wrapText="true" HBox.hgrow="NEVER">
303+
<CheckBox fx:id="emptyNoteReminderOnlyForWorkEntryCheckBox" mnemonicParsing="false" text="Ask for notes when switching from project marked as work (if empty)" wrapText="true" HBox.hgrow="NEVER">
304304
<font>
305305
<Font name="Open Sans Regular" size="12.0" />
306306
</font>

0 commit comments

Comments
 (0)