Skip to content

Commit c770b32

Browse files
JSchraffJSchraff
committed
code cleanup
1 parent 1ee1004 commit c770b32

File tree

2 files changed

+48
-75
lines changed

2 files changed

+48
-75
lines changed

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

Lines changed: 38 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,11 @@
3838
import javafx.scene.control.ComboBox;
3939
import javafx.scene.control.DatePicker;
4040
import javafx.scene.control.ListCell;
41-
import javafx.scene.control.ListView;
4241
import javafx.scene.control.Spinner;
4342
import javafx.scene.control.SpinnerValueFactory;
4443
import javafx.scene.control.TextArea;
4544
import javafx.scene.layout.GridPane;
4645
import javafx.scene.paint.Color;
47-
import javafx.util.Callback;
4846
import javafx.util.StringConverter;
4947
import javafx.util.converter.LocalTimeStringConverter;
5048

@@ -113,10 +111,6 @@ private void initialize() {
113111

114112
startTimeSpinner.setValueFactory(new SpinnerValueFactory<LocalTime>() {
115113

116-
{
117-
setConverter(new LocalTimeStringConverter(FormatStyle.MEDIUM));
118-
}
119-
120114
@Override
121115
public void decrement(final int steps) {
122116
if (getValue() == null) {
@@ -140,11 +134,10 @@ public void increment(final int steps) {
140134
}
141135

142136
});
143-
endTimeSpinner.setValueFactory(new SpinnerValueFactory<LocalTime>() {
144137

145-
{
146-
setConverter(new LocalTimeStringConverter(FormatStyle.MEDIUM));
147-
}
138+
startTimeSpinner.getValueFactory().setConverter(new LocalTimeStringConverter(FormatStyle.MEDIUM));
139+
140+
endTimeSpinner.setValueFactory(new SpinnerValueFactory<LocalTime>() {
148141

149142
@Override
150143
public void decrement(final int steps) {
@@ -169,31 +162,26 @@ public void increment(final int steps) {
169162
}
170163

171164
});
165+
endTimeSpinner.getValueFactory().setConverter(new LocalTimeStringConverter(FormatStyle.MEDIUM));
172166

173167
setUpComboBox();
174168

175169
}
176170

177171
private void setUpComboBox() {
178172
// color Dropdown Options
179-
projectComboBox.setCellFactory(new Callback<ListView<Project>, ListCell<Project>>() {
173+
projectComboBox.setCellFactory(listView -> new ListCell<Project>() {
180174

181175
@Override
182-
public ListCell<Project> call(final ListView<Project> l) {
183-
return new ListCell<Project>() {
184-
185-
@Override
186-
protected void updateItem(final Project item, final boolean empty) {
187-
super.updateItem(item, empty);
188-
if (item == null || empty) {
189-
setGraphic(null);
190-
} else {
191-
setColor(this, item.getColor());
192-
setText(item.getName());
193-
194-
}
195-
}
196-
};
176+
protected void updateItem(final Project item, final boolean empty) {
177+
super.updateItem(item, empty);
178+
if (item == null || empty) {
179+
setGraphic(null);
180+
} else {
181+
setColor(this, item.getColor());
182+
setText(item.getName());
183+
184+
}
197185
}
198186
});
199187

@@ -218,25 +206,22 @@ public Project fromString(final String string) {
218206
// needs to set again because editable is ignored from fxml because of custom preselection
219207
projectComboBox.setEditable(true);
220208

221-
projectComboBox.valueProperty().addListener(new ChangeListener<Project>() {
209+
projectComboBox.valueProperty().addListener(
210+
(final ObservableValue<? extends Project> observable, final Project oldValue, final Project newValue) -> {
211+
if (newValue == null) {
212+
return;
213+
}
222214

223-
@Override
224-
public void changed(final ObservableValue<? extends Project> observable, final Project oldValue,
225-
final Project newValue) {
226-
if (newValue == null) {
227-
return;
215+
selectedProject = newValue;
216+
comboChange = true;
217+
// needed to avoid exception on empty textfield https://bugs.openjdk.java.net/browse/JDK-8081700
218+
Platform.runLater(() -> {
219+
projectComboBox.getEditor().selectAll();
220+
setColor(projectComboBox, newValue.getColor());
221+
});
228222
}
229223

230-
selectedProject = newValue;
231-
comboChange = true;
232-
// needed to avoid exception on empty textfield https://bugs.openjdk.java.net/browse/JDK-8081700
233-
Platform.runLater(() -> {
234-
projectComboBox.getEditor().selectAll();
235-
setColor(projectComboBox, newValue.getColor());
236-
});
237-
238-
}
239-
});
224+
);
240225

241226
projectComboBox.getEditor().textProperty().addListener(new ChangeListener<String>() {
242227

@@ -255,15 +240,15 @@ public void changed(final ObservableValue<? extends String> observable, final St
255240
}
256241

257242
// is necessary to not autoselect same Project if Project was selected
258-
if (isValidProject) {
243+
if (Boolean.TRUE.equals(isValidProject)) {
259244
isValidProject = false;
260245
projectComboBox.getSelectionModel().clearSelection();
261246
}
262247
// needed to avoid exception on empty textfield https://bugs.openjdk.java.net/browse/JDK-8081700
263248
Platform.runLater(() -> {
264249

265250
projectComboBox.hide();
266-
projectComboBox.setItems(model.getAllProjects().filtered((project) -> ProjectsListViewController
251+
projectComboBox.setItems(model.getAllProjects().filtered(project -> ProjectsListViewController
267252
.doesProjectMatchSearchFilter(projectComboBox.getEditor().getText(), project)));
268253
if (projectComboBox.getEditor().focusedProperty().get()) {
269254
projectComboBox.show();
@@ -274,20 +259,16 @@ public void changed(final ObservableValue<? extends String> observable, final St
274259
}
275260
});
276261

277-
projectComboBox.getEditor().focusedProperty().addListener(new ChangeListener<Boolean>() {
278-
279-
@Override
280-
public void changed(final ObservableValue<? extends Boolean> observable, final Boolean oldIsFocused,
281-
final Boolean newIsFocused) {
282-
if (newIsFocused) {
283-
// needed to avoid exception on empty textfield https://bugs.openjdk.java.net/browse/JDK-8081700
284-
Platform.runLater(() -> projectComboBox.getEditor().selectAll());
285-
} else {
286-
// needed to avoid exception on empty textfield https://bugs.openjdk.java.net/browse/JDK-8081700
287-
Platform.runLater(() -> projectComboBox.hide());
288-
}
289-
262+
projectComboBox.getEditor().focusedProperty().addListener((final ObservableValue<? extends Boolean> observable,
263+
final Boolean oldIsFocused, final Boolean newIsFocused) -> {
264+
if (Boolean.TRUE.equals(newIsFocused)) {
265+
// needed to avoid exception on empty textfield https://bugs.openjdk.java.net/browse/JDK-8081700
266+
Platform.runLater(() -> projectComboBox.getEditor().selectAll());
267+
} else {
268+
// needed to avoid exception on empty textfield https://bugs.openjdk.java.net/browse/JDK-8081700
269+
Platform.runLater(() -> projectComboBox.hide());
290270
}
271+
291272
});
292273

293274
}

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

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import de.doubleslash.keeptime.model.Project;
4141
import de.doubleslash.keeptime.model.Work;
4242
import javafx.event.ActionEvent;
43-
import javafx.event.EventHandler;
4443
import javafx.fxml.FXML;
4544
import javafx.fxml.FXMLLoader;
4645
import javafx.geometry.Insets;
@@ -98,8 +97,6 @@ public class ReportController {
9897

9998
private static final Logger LOG = LoggerFactory.getLogger(ReportController.class);
10099

101-
private DatePicker datePicker; // for calendar element
102-
103100
private Model model;
104101

105102
private Controller controller;
@@ -300,23 +297,18 @@ private GridPane setUpEditWorkGridPane(final Work work, final Dialog<Work> dialo
300297

301298
private Button createProjectReport() {
302299
final Button bProjectReport = new Button("Copy to clipboard");
303-
final EventHandler<ActionEvent> eventListener = new EventHandler<ActionEvent>() {
304300

305-
@Override
306-
public void handle(final ActionEvent event) {
307-
final Object source = event.getSource();
308-
final Button btn = (Button) source;
309-
final Object userData = btn.getUserData();
310-
final String notes = (String) userData;
311-
312-
final Clipboard clipboard = Clipboard.getSystemClipboard();
313-
final ClipboardContent content = new ClipboardContent();
314-
content.putString(notes);
315-
clipboard.setContent(content);
316-
}
301+
bProjectReport.setOnAction((final ActionEvent event) -> {
302+
final Object source = event.getSource();
303+
final Button btn = (Button) source;
304+
final Object userData = btn.getUserData();
305+
final String notes = (String) userData;
317306

318-
};
319-
bProjectReport.setOnAction(eventListener);
307+
final Clipboard clipboard = Clipboard.getSystemClipboard();
308+
final ClipboardContent content = new ClipboardContent();
309+
content.putString(notes);
310+
clipboard.setContent(content);
311+
});
320312
return bProjectReport;
321313
}
322314

0 commit comments

Comments
 (0)