Changeset 1102 for trunk/src/org/apollo/agents/MelodySearch.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/apollo/agents/MelodySearch.java (modified) (13 diffs)

trunk/src/org/apollo/agents/MelodySearch.java

@@ -1 +1 @@
 package org.apollo.agents;
 
-import java.awt.Color;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -10 +9 @@
 
 import javax.sound.sampled.AudioFormat;
-import javax.swing.SwingUtilities;
 
 import org.apollo.ApolloSystem;
@@ -26 +24 @@
 import org.apollo.widgets.TrackWidgetCommons;
 import org.expeditee.agents.SearchAgent;
+import org.expeditee.core.Colour;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
-import org.expeditee.settings.UserSettings;
 import org.expeditee.settings.folders.FolderSettings;
 import org.expeditee.items.Item;
 import org.expeditee.items.ItemUtils;
-import org.expeditee.items.widgets.InteractiveWidget;
+import org.expeditee.items.widgets.Widget;
 import org.expeditee.items.widgets.WidgetCorner;
 import org.expeditee.items.widgets.WidgetEdge;
@@ -42 +40 @@
  * Uses meldex. Thanks David Bainbridge.
  * 
- * The agent runs a querry on the given track widget that launched it.
+ * The agent runs a query on the given track widget that launched it.
  * If the track launches it it does a full search for all tracks on the current frameset.
  * 
@@ -96 +94 @@
          */
         @Override
-        public boolean initialise(Frame frame, Item item) {
+        public boolean initialise(Frame frame, Item item)
+        {
                 if (!super.initialise(frame, item)) return false;
                 
@@ -104 +103 @@
                 if (item != null) {
                         
-                        InteractiveWidget iw = null;
+                        Widget iw = null;
                         
                         if (item instanceof WidgetCorner) {
@@ -162 +161 @@
                                 
                                 if (querryMelody == null) { // abort - failed to get audio
-                                        SwingUtilities.invokeLater(new ExpediteeMessageBayFeedback(
-                                                        "Melody search aborted: Failed to load tracks audio"));
+                                        overwriteMessage("Melody search aborted: Failed to load tracks audio");
                                         _results.addText("Melody search aborted: querry data not good enough to search with", 
-                                                        Color.RED, null, null, false);
+                                                        Colour.RED, null, null, false);
                                         _results.addText("Click here for help on melody searches", 
-                                                        new Color(0, 180, 0), ApolloSystem.HELP_MELODYSEARCH_FRAMENAME, null, false);
+                                                        Colour.FromRGB255(0, 180, 0), ApolloSystem.HELP_MELODYSEARCH_FRAMENAME, null, false);
                                         
                                         _results.save();
@@ -186 +184 @@
                                 
                                 if (querryMelody == null) { // abort - failed to get audio
-                                        SwingUtilities.invokeLater(new ExpediteeMessageBayFeedback(
-                                                        "Melody search aborted: Failed to proccess querry data"));
-                                        _results.addText("Melody search aborted: querry data not good enough to search with", Color.RED, null, null, false);
+                                        overwriteMessage("Melody search aborted: Failed to proccess querry data");
+                                        _results.addText("Melody search aborted: querry data not good enough to search with", Colour.RED, null, null, false);
                                         _results.addText("Click here for help on melody searches", 
-                                                        new Color(0, 180, 0), ApolloSystem.HELP_MELODYSEARCH_FRAMENAME, null, false);
+                                                        Colour.FromRGB255(0, 180, 0), ApolloSystem.HELP_MELODYSEARCH_FRAMENAME, null, false);
                                         _results.save();
                                         return null;
@@ -240 +237 @@
                                         if(!results.isEmpty()) { 
                                                 _results.addText(frameName + "(" + results.size() + ")", null, frameName, null, false);
-                                                FrameGraphics.requestRefresh(true);
+                                                DisplayController.requestRefresh(true);
                                         }
                                         
@@ -395 +392 @@
 
                                 if (melodyScores.isEmpty() || melodyScores.get(0).getScore() > threshold) {
-                                        _results.addText("No matches", Color.RED, null, null, false);
+                                        _results.addText("No matches", Colour.RED, null, null, false);
                                         _results.addText("Click here to find out how to improve your melody searches", 
-                                                        new Color(0, 180, 0), ApolloSystem.HELP_MELODYSEARCH_FRAMENAME, null, false);
+                                                        Colour.FromRGB255(0, 180, 0), ApolloSystem.HELP_MELODYSEARCH_FRAMENAME, null, false);
                                 } else {
                                         
@@ -426 +423 @@
                         
                         if (_stop) {
-                                _results.addText("Search cancelled", Color.RED, null, null, false);
+                                _results.addText("Search cancelled", Colour.RED, null, null, false);
                         }
                         
@@ -444 +441 @@
                 
         }
-        
-
-        
         
         /**
@@ -470 +464 @@
 
         }
-        
-        /**
-         * Safely outputs a message on the messagebay .. if ran on swing thread.
-         * @author Brook Novak
-         *
-         */
-        private class ExpediteeMessageBayFeedback implements Runnable {
-                
-                String feedbackMessage; 
-                
-                public ExpediteeMessageBayFeedback(String feedbackMessage) {
-                        assert(feedbackMessage != null);
-                        this.feedbackMessage = feedbackMessage;
-                }
-                
-                
-                public void run() {
-                        assert(feedbackMessage != null);
-                        overwriteMessage(feedbackMessage);
-                }
-        }
-        
-        
 }