Library updates and graphical/usability improvements

Author: Bytekeeper

build.gradle

@@ -11,14 +11,14 @@ buildscript {
 }
 
 plugins {
-    id "net.ltgt.apt" version "0.9"
+    id "net.ltgt.apt" version "0.10"
 }
 
-apply plugin: 'application';
-apply plugin: 'java';
-apply plugin: 'findbugs';
-apply plugin: 'pmd';
-apply plugin: 'jacoco';
+apply plugin: 'application'
+apply plugin: 'java'
+apply plugin: 'findbugs'
+apply plugin: 'pmd'
+apply plugin: 'jacoco'
 apply plugin: 'com.github.ben-manes.versions'
 apply plugin: 'idea'
 apply plugin: 'antlr'
@@ -39,13 +39,9 @@ repositories {
 version = '2'
 archivesBaseName = 'STT'
 
-def javaHome = System.properties['java.home']
-
 sourceCompatibility = 1.8
 mainClassName='org.stt.StartWithJFX'
 
-ext.mainClass = mainClassName
-
 findbugs {
 	excludeFilter = file("$rootProject.projectDir/config/findbugs/excludeFilter.xml")
 }
@@ -97,7 +93,7 @@ tasks.withType(FindBugs) {
 }
 
 task wrapper(type: Wrapper) {
-	gradleVersion = '3.4'
+	gradleVersion = '3.5'
 }
 
 task release(dependsOn: 'distZip') {

src/main/java/org/stt/gui/jfx/ActivitiesController.java

@@ -158,7 +158,7 @@ public void onAchievementsRefresh(AchievementsUpdated refreshedAchievements) {
         updateAchievements();
     }
 
-    @Handler(priority = -1)
+    @Handler
     public void onItemChange(ItemModified event) {
         updateItems();
     }
@@ -315,9 +315,9 @@ private ObservableList<String> createSuggestionsForContinuationList() {
 
     @FXML
     public void initialize() {
-        if (activitiesConfig.isAutoCompletionPopup()) {
-            setupAutoCompletionPopup();
-        }
+//        if (activitiesConfig.isAutoCompletionPopup()) {
+//            setupAutoCompletionPopup();
+//        }
 
         addWorktimePanel();
         addCommandText();

src/main/java/org/stt/gui/jfx/ReportController.java

@@ -24,11 +24,16 @@
 import javafx.scene.text.Font;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+import net.engio.mbassy.listener.Listener;
+import net.engio.mbassy.listener.References;
 import org.controlsfx.control.NotificationPane;
 import org.stt.config.ReportConfig;
 import org.stt.gui.jfx.binding.MappedListBinding;
 import org.stt.gui.jfx.binding.ReportBinding;
 import org.stt.gui.jfx.binding.STTBindings;
+import org.stt.model.ItemModified;
 import org.stt.query.TimeTrackingItemQueries;
 import org.stt.reporting.SummingReportGenerator.Report;
 import org.stt.text.ItemGrouper;
@@ -89,6 +94,7 @@ public class ReportController {
 
     private NotificationPane panel;
     private Font fontaweSome;
+    private final MBassador<Object> eventBus;
     private PauseTransition notificationPause = new PauseTransition(javafx.util.Duration.seconds(2));
     private TemporalField dayOfWeekField = WeekFields.of(Locale.getDefault()).dayOfWeek();
     private Set<LocalDate> trackedDays;
@@ -99,13 +105,15 @@ public class ReportController {
                      DurationRounder rounder,
                      ItemGrouper itemGrouper,
                      ReportConfig config,
-                     @Named("glyph") Font fontaweSome) {
+                     @Named("glyph") Font fontaweSome,
+                     MBassador<Object> eventBus) {
         this.localization = requireNonNull(localization);
         this.config = requireNonNull(config);
         this.timeTrackingItemQueries = requireNonNull(searcher);
         this.rounder = requireNonNull(rounder);
         this.itemGrouper = requireNonNull(itemGrouper);
         this.fontaweSome = requireNonNull(fontaweSome);
+        this.eventBus = requireNonNull(eventBus);
 
         List<String> colorStrings = config.getGroupColors();
         groupColors = new Color[colorStrings.size()];
@@ -142,7 +150,8 @@ public void initialize() {
         tableForReport.getSelectionModel().selectedIndexProperty().addListener(i ->
                 Platform.runLater(tableForReport.getSelectionModel()::clearSelection));
 
-        final ObservableValue<Report> reportModel = createReportModel();
+        final ObjectBinding<Report> reportModel = createReportModel();
+        eventBus.subscribe(new OnItemChangeListener(reportModel));
         final StringBinding startBinding = createBindingForStartOfReport(reportModel);
         final StringBinding endBinding = createBindingForEndOfReport(reportModel);
         final ObjectBinding<Duration> uncoveredTimeBinding = createBindingForUncoveredTimeOfReport(reportModel);
@@ -237,7 +246,7 @@ public void updateItem(LocalDate item, boolean empty) {
         toolbar.getItems().add(oneWeekForward);
     }
 
-    private ObservableValue<Report> createReportModel() {
+    private ObjectBinding<Report> createReportModel() {
         ObservableValue<LocalDate> nextDay = Bindings.createObjectBinding(
                 () -> datePicker.getValue() != null ? datePicker
                         .getValue().plusDays(1) : null, datePicker.valueProperty());
@@ -467,4 +476,18 @@ public Duration getRoundedDuration() {
             return roundedDuration;
         }
     }
+
+    @Listener(references = References.Strong)
+    private static class OnItemChangeListener {
+        private final ObjectBinding<?> binding;
+
+        private OnItemChangeListener(ObjectBinding<?> binding) {
+            this.binding = binding;
+        }
+
+        @Handler
+        public void onItemChanged(ItemModified changeEvent) {
+            binding.invalidate();
+        }
+    }
 }

src/main/java/org/stt/gui/jfx/TimeTrackingItemCell.java

@@ -100,7 +100,7 @@ class TimeTrackingItemCell extends ListCell<TimeTrackingItem> {
         setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
     }
 
-    private VBox createDateSubheader(Font fontAwesome) {
+    private Node createDateSubheader(Font fontAwesome) {
         HBox newDayHbox = new HBox(5);
         newDayHbox.setPadding(new Insets(2));
         Label calenderIcon = glyph(fontAwesome, Glyph.CALENDAR);
@@ -112,7 +112,7 @@ private VBox createDateSubheader(Font fontAwesome) {
                 () -> itemProperty().get() == null ? "" : DATE_FORMATTER.format(itemProperty().get().getStart()),
                 itemProperty()));
         newDayHbox.getChildren().add(dayLabel);
-        return new VBox(10, new Separator(), newDayHbox);
+        return newDayHbox;
     }
 
     protected void setupTooltips(ResourceBundle localization) {

src/main/java/org/stt/query/TimeTrackingItemQueries.java

@@ -35,7 +35,7 @@ public TimeTrackingItemQueries(Provider<ItemReader> provider,
         eventbus.ifPresent(bus -> bus.subscribe(this));
     }
 
-    @Handler
+    @Handler(priority = Integer.MAX_VALUE)
     public synchronized void sourceChanged(ItemModified event) {
         cachedItems = null;
         LOG.fine("Clearing query cache");

src/main/resources/org/stt/gui/jfx/Activities.css

@@ -9,6 +9,3 @@
 }
 
 .value { -fx-fill: blue; }
-
-.list-cell:odd { -fx-background-color: transparent; }
-.list-cell:even{ -fx-background-color: transparent; }

src/main/resources/org/stt/gui/jfx/Reports.css

@@ -1,8 +1,4 @@
-.table-view {
-    -fx-control-inner-background-alt: -fx-control-inner-background;
-}
-
 .table-cell {
-    -fx-border-color: transparent transparent -fx-table-cell-border-color transparent;
+    -fx-border-color: transparent;
     -fx-padding: 1em;
 }

src/test/java/org/stt/gui/jfx/binding/ReportBindingTest.java

@@ -42,7 +42,8 @@ public class ReportBindingTest {
 	@Before
 	public void setup() {
         readerProvider = () -> itemReader;
-        sut = new ReportBinding(reportStart, reportEnd, new TimeTrackingItemQueries(readerProvider, Optional.empty()));
+        sut = new ReportBinding(reportStart, reportEnd,
+                new TimeTrackingItemQueries(readerProvider, Optional.empty()));
     }
 
 	@Test