Task 4: Complete the Query class

Author: doct0rX

SoftwareConstruction_ObjectOrientedDesign/finalProject/final-project-starter/TwitterMapperStarter/out/query/Query.class

@@ -3,15 +3,20 @@
 import filters.Filter;
 import org.openstreetmap.gui.jmapviewer.JMapViewer;
 import org.openstreetmap.gui.jmapviewer.Layer;
+import twitter4j.Status;
+import ui.MapMarkerSimple;
+import util.Util;
 
 import javax.swing.*;
 import java.awt.*;
+import java.util.Observable;
+import java.util.Observer;
 
 /**
  * A query over the twitter stream.
- * TODO: Task 4: you are to complete this class.
  */
-public class Query {
+public class Query implements Observer {
+
     // The map on which to display markers when the query matches
     private final JMapViewer map;
     // Each query has its own "layer" so they can be turned on and off all at once
@@ -24,6 +29,8 @@ public class Query {
     private final Filter filter;
     // The checkBox in the UI corresponding to this query (so we can turn it on and off and delete it)
     private JCheckBox checkBox;
+    // For the statues of the observable (TwitterSource)
+    private Status status;
 
     public Color getColor() {
         return color;
@@ -61,13 +68,21 @@ public String toString() {
         return "Query: " + queryString;
     }
 
+    @Override
+    public void update(Observable o, Object arg) {
+        this.status = (Status) arg;
+        if (filter.matches((Status) arg)) {
+            map.addMapMarker(new MapMarkerSimple(layer, Util.statusCoordinate((Status) arg)));
+        }
+    }
+
     /**
      * This query is no longer interesting, so terminate it and remove all traces of its existence.
      *
-     * TODO: Implement this method
      */
     public void terminate() {
-
+//        map.removeMapMarker(new MapMarkerSimple(layer, Util.statusCoordinate(this.status)));
+        map.removeAllMapMarkers();
     }
 }
 

SoftwareConstruction_ObjectOrientedDesign/finalProject/final-project-starter/TwitterMapperStarter/out/twitter/TwitterSource.class

@@ -11,7 +11,6 @@ public abstract class TwitterSource extends Observable {
     protected boolean doLogging = true;
     // The set of terms to look for in the stream of tweets
     protected Set<String> terms = new HashSet<>();
-    private List<Observer> observers = new ArrayList<>();
 
     // Called each time a new set of filter terms has been established
     abstract protected void sync();

SoftwareConstruction_ObjectOrientedDesign/finalProject/final-project-starter/TwitterMapperStarter/out/ui/Application.class

@@ -55,7 +55,7 @@ public void addQuery(Query query) {
         Set<String> allterms = getQueryTerms();
         twitterSource.setFilterTerms(allterms);
         contentPanel.addQuery(query);
-        // TODO: This is the place where you should connect the new query to the twitter source
+        twitterSource.addObserver(query);
     }
 
     /**
@@ -189,6 +189,8 @@ public void run() {
     // A query has been deleted, remove all traces of it
     public void terminateQuery(Query query) {
         // TODO: This is the place where you should disconnect the expiring query from the twitter source
+        query.terminate();
+        twitterSource.deleteObserver(query);
         queries.remove(query);
         Set<String> allterms = getQueryTerms();
         twitterSource.setFilterTerms(allterms);