Merge pull request #650 from AustinShalit/editedBug

Fix bug introduced in #647

Author: AustinShalit

core/src/main/java/edu/wpi/grip/core/serialization/Project.java

@@ -21,7 +21,10 @@
 import java.io.StringReader;
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Optional;
+import java.util.function.Consumer;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -37,7 +40,7 @@ public class Project {
   @Inject
   private PipelineRunner pipelineRunner;
   private Optional<File> file = Optional.empty();
-  private boolean saveIsDirty = false;
+  private final ObservableBoolean saveIsDirty = new ObservableBoolean();
 
   @Inject
   public void initialize(StepConverter stepConverter,
@@ -111,7 +114,7 @@ void open(Reader reader) {
     this.pipeline.clear();
     this.xstream.fromXML(reader);
     pipelineRunner.startAsync();
-    saveIsDirty = false;
+    saveIsDirty.set(false);
   }
 
   /**
@@ -127,19 +130,42 @@ public void save(File file) throws IOException {
 
   public void save(Writer writer) {
     this.xstream.toXML(this.pipeline, writer);
-    saveIsDirty = false;
+    saveIsDirty.set(false);
   }
 
   public boolean isSaveDirty() {
-    return saveIsDirty;
+    return saveIsDirty.get();
+  }
+
+  public void addIsSaveDirtyConsumer(Consumer<Boolean> consumer) {
+    saveIsDirty.addConsumer(consumer);
   }
 
   @Subscribe
   public void onDirtiesSaveEvent(DirtiesSaveEvent dirtySaveEvent) {
     // Only update the flag the save isn't already dirty
     // We don't need to be redundantly checking if the event dirties the save
-    if (!saveIsDirty && dirtySaveEvent.doesDirtySave()) {
-      saveIsDirty = true;
+    if (!saveIsDirty.get() && dirtySaveEvent.doesDirtySave()) {
+      saveIsDirty.set(true);
+    }
+  }
+
+  private static final class ObservableBoolean {
+
+    private boolean b = false;
+    private final List<Consumer<Boolean>> consumers = new LinkedList<>();
+
+    public void set(boolean b) {
+      this.b = b;
+      consumers.parallelStream().forEach(c -> c.accept(b));
+    }
+
+    public boolean get() {
+      return b;
+    }
+
+    public void addConsumer(Consumer<Boolean> consumer) {
+      consumers.add(consumer);
     }
   }
 }

ui/src/main/java/edu/wpi/grip/ui/Main.java

@@ -3,7 +3,6 @@
 import edu.wpi.grip.core.GripCoreModule;
 import edu.wpi.grip.core.GripFileModule;
 import edu.wpi.grip.core.PipelineRunner;
-import edu.wpi.grip.core.events.DirtiesSaveEvent;
 import edu.wpi.grip.core.events.UnexpectedThrowableEvent;
 import edu.wpi.grip.core.http.GripServer;
 import edu.wpi.grip.core.http.HttpPipelineSwitcher;
@@ -32,7 +31,6 @@
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.application.Preloader;
-import javafx.beans.property.SimpleBooleanProperty;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
@@ -63,7 +61,6 @@ public class Main extends Application {
   @Inject private HttpPipelineSwitcher pipelineSwitcher;
   private Parent root;
   private boolean headless;
-  private final SimpleBooleanProperty dirty = new SimpleBooleanProperty(false);
 
   public static void main(String[] args) {
     launch(args);
@@ -127,11 +124,11 @@ public void start(Stage stage) throws IOException {
       cvOperations.addOperations();
       notifyPreloader(new Preloader.ProgressNotification(0.9));
 
-      dirty.addListener((observable, oldValue, newValue) -> {
+      project.addIsSaveDirtyConsumer(newValue -> {
         if (newValue) {
-          stage.setTitle(MAIN_TITLE + " | Edited");
+          Platform.runLater(() -> stage.setTitle(MAIN_TITLE + " | Edited"));
         } else {
-          stage.setTitle(MAIN_TITLE);
+          Platform.runLater(() -> stage.setTitle(MAIN_TITLE));
         }
       });
 
@@ -151,13 +148,6 @@ public void stop() {
     SafeShutdown.flagStopping();
   }
 
-  @Subscribe
-  public void onDirtiesSaveEvent(DirtiesSaveEvent dirtySaveEvent) {
-    if (dirty.get() != dirtySaveEvent.doesDirtySave()) {
-      dirty.set(dirtySaveEvent.doesDirtySave());
-    }
-  }
-
   @Subscribe
   @SuppressWarnings("PMD.AvoidCatchingThrowable")
   public final void onUnexpectedThrowableEvent(UnexpectedThrowableEvent event) {