Skip to content

Commit 5f5e855

Browse files
committed
there are almost no sonar issues left
1 parent e8a85b5 commit 5f5e855

File tree

5 files changed

+5
-9
lines changed

5 files changed

+5
-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
@@ -157,7 +157,7 @@ private void initialisePopupUI(final Stage primaryStage) throws IOException {
157157
popupViewStage.setAlwaysOnTop(true);
158158
final ViewControllerPopup viewControllerPopupController = loader.getController();
159159
viewControllerPopupController.setStage(popupViewStage);
160-
viewControllerPopupController.setController(controller, model);
160+
viewControllerPopupController.setControllerAndModel(controller, model);
161161
globalScreenListener.setViewController(viewControllerPopupController);
162162

163163
}

src/main/java/de/doubleslash/keeptime/common/DateFormatter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ public static String secondsToHHMMSS(final long currentWorkSeconds) {
1919

2020
final int sec = (int) (currentWorkSeconds % 3600 % 60);
2121

22-
final String a = (hours > 9 ? hours : "0" + hours) + ":" + (minutes > 9 ? minutes : "0" + minutes) + ":"
22+
return (hours > 9 ? hours : "0" + hours) + ":" + (minutes > 9 ? minutes : "0" + minutes) + ":"
2323
+ (sec > 9 ? sec : "0" + sec);
24-
return a;
2524
}
2625

2726
public static long getSecondsBewtween(final LocalDateTime startDate, final LocalDateTime endDate) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public Model(final ProjectRepository projectRepository, final WorkRepository wor
4949
protected static final ObservableList<Work> pastWorkItems = FXCollections.observableArrayList();
5050
public static final ObjectProperty<Work> activeWorkItem = new SimpleObjectProperty<>();
5151

52-
public static final long NEEDED_WORK_SECONDS = 60 * 60 * 8; // 8 hours
52+
public static final long NEEDED_WORK_SECONDS = (long) (60 * 60 * 8.0); // 8 hours
5353

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

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,8 +453,7 @@ private void loadSubStages() {
453453
}
454454

455455
private FXMLLoader createFXMLLoader(final RESOURCE fxmlLayout) {
456-
final FXMLLoader fxmlLoader = new FXMLLoader(Resources.getResource(fxmlLayout));
457-
return fxmlLoader;
456+
return new FXMLLoader(Resources.getResource(fxmlLayout));
458457
}
459458

460459
private Node addProjectToProjectList(final Project p) {

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public class ViewControllerPopup {
3838
private Stage stage;
3939

4040
private Controller controller;
41-
private Model model;
4241

4342
private FilteredList<Project> filteredData;
4443

@@ -160,9 +159,8 @@ protected void updateItem(final Project project, final boolean empty) {
160159

161160
}
162161

163-
public void setController(final Controller controller, final Model model) {
162+
public void setControllerAndModel(final Controller controller, final Model model) {
164163
this.controller = controller;
165-
this.model = model;
166164

167165
filteredData = new FilteredList<>(model.getSortedAvailableProjects(), p -> true);
168166
projectListView.setItems(filteredData);

0 commit comments

Comments
 (0)