Changeset 22277 for gs3-extensions/atlas-src

Timestamp:

2010-06-18T16:08:27+12:00 (14 years ago)

Author:

sjm84

Message:

Added several improvements to the code such as the ability to remove places if they from the text and map if they should not be places

Location:

gs3-extensions/atlas-src/trunk/src/org/greenstone

Files:

• client/GS3MapLibrary.java (modified) (9 diffs)
• client/Menu.java (modified) (6 diffs)
• client/MenuItem.java (modified) (1 diff)
• client/TemporaryFrame.java (modified) (1 diff)
• server/PageScanner.java (modified) (1 diff)

gs3-extensions/atlas-src/trunk/src/org/greenstone/client/GS3MapLibrary.java

@@ -11 +11 @@
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.event.dom.client.MouseDownEvent;
-import com.google.gwt.event.dom.client.MouseDownHandler;
-import com.google.gwt.event.dom.client.MouseEvent;
 import com.google.gwt.event.dom.client.MouseMoveEvent;
 import com.google.gwt.event.dom.client.MouseMoveHandler;
@@ -129 +126 @@
 
     protected ArrayList<ArrayList<Place>> _currentMultiPlaces = null;
-
-    protected HashMap<String, Place> _chosenPlaces = new HashMap<String, Place>();
+    protected ArrayList<String> _removedPlaces = new ArrayList<String>();
+    
+    protected HashMap<String, Place> _chosenPlaces = new HashMap<String, Place>();  
 
     protected HandlerRegistration _fishEyeHandlerReg = null;
@@ -1595 +1593 @@
 
                 //If a different place with this name has been chosen then don't use it
-                if (_chosenPlaces.containsKey(p.getName()) && !_chosenPlaces.get(p.getName()).equals(p))
+                if ((_chosenPlaces.containsKey(p.getName()) && !_chosenPlaces.get(p.getName()).equals(p)) || _removedPlaces.contains(p.getName()))
                 {
                     continue;
@@ -2325 +2323 @@
             }
         }));
-
-        final MenuItem prevMenuItem = new MenuItem("Remove all highlights", new ClickHandler()
+        
+        menuItems.add(new MenuItem("Remove all highlights", new ClickHandler()
         {
             public void onClick(ClickEvent event)
@@ -2350 +2348 @@
                 _currentDocumentMenu.hideMenu();
             }
+        }));
+        
+        final MenuItem prevMenuItem = new MenuItem("Remove this place", new ClickHandler()
+        {
+            public void onClick(ClickEvent event)
+            {
+                _removedPlaces.add(_selectedPlaceName);
+                _currentDocumentMenu.hideMenu();
+                
+                JsArray<Element> textPlaces = getElementsByTagName("span");
+
+                //Add the place spans to the array
+                for (int j = 0; j < textPlaces.length(); j++)
+                {
+                    Element e = textPlaces.get(j);
+                    if (e.getAttribute("class").equals("place") && e.getInnerText().equals(_selectedPlaceName))
+                    {
+                        e.getParentElement().insertBefore(e.getFirstChild(), e);
+                    }
+                }
+                
+                addPlacesToMap(_currentPlaces, "#FFFFFF", "#00FF00", false);
+            }
         });
         menuItems.add(prevMenuItem);
 
-        menuItems.add(new MenuItem("Choose correct place           >", new ClickHandler()
+        menuItems.add(new MenuItem("Choose correct place >", new ClickHandler()
         {
             public void onClick(ClickEvent event)
@@ -2359 +2380 @@
                 logToConsole("MARKER!");
                 ArrayList<MenuItem> places = new ArrayList<MenuItem>();
+
                 ArrayList<Place> matchingPlaces = new ArrayList<Place>();
 
@@ -2368 +2390 @@
                     }
                 }
-
+                
                 for (final Place p : matchingPlaces)
                 {
@@ -2425 +2447 @@
                 placeMenu.showMenu();
             }
-        }));
+        }){
+            public boolean condition()
+            {
+                ArrayList<Place> matchingPlaces = new ArrayList<Place>();
+
+                if(_currentPlaces == null || _currentPlaces.size() == 0)
+                {
+                    return false;
+                }
+                
+                for (Place p : _currentPlaces)
+                {
+                    if (p.getName().equals(_selectedPlaceName))
+                    {
+                        matchingPlaces.add(p);
+                    }
+                }
+                
+                if(matchingPlaces.size() > 1)
+                {
+                    return true;
+                }
+                return false;
+            }
+        });
 
         documentMenu.addMenuItems(menuItems);
@@ -2616 +2662 @@
             public void run()
             {
+                _currentDocumentMenu.refreshMenu();
                 _currentDocumentMenu.moveMenu(x, y);
                 _currentDocumentMenu.showMenu();

gs3-extensions/atlas-src/trunk/src/org/greenstone/client/Menu.java

@@ -13 +13 @@
 public class Menu
 {
+    protected Element _parent = null;
     protected ArrayList<Menu> _childMenus = new ArrayList<Menu>();
     protected ArrayList<MenuItem> _menuItems = new ArrayList<MenuItem>();
@@ -21 +22 @@
     public Menu(Element parent, MouseOverHandler onMouseOver, MouseOutHandler onMouseOut)
     {
+        _parent = parent;
         parent.appendChild(_menuDiv.getElement());
         _menuDiv.getElement().getStyle().setProperty("background", "#FFFFFF");
@@ -32 +34 @@
     public void addMenuItems(ArrayList<MenuItem> menuItems)
     {
+        _menuItems = menuItems;
         int maxWidth = -1;
         for(int i = 0; i < menuItems.size(); i++)
         {
+            if(!menuItems.get(i).condition())
+            {
+                continue;
+            }
             Element item = menuItems.get(i).getMenuElement();
             item.getStyle().setProperty("background", "#FFFFFF");
@@ -69 +76 @@
         {
             public void run() 
-            {
-                //GS3MapLibrary.logToConsole("Menu height = " + _menuDiv.getOffsetHeight() + ", Div height = " + GS3MapLibrary.getElementById("GSContent").getOffsetHeight() + ", Top = " + GS3MapLibrary.getElementById("GSContent").getAbsoluteTop());
-                
+            {               
                 if (_menuDiv.getOffsetHeight() > GS3MapLibrary.getElementById("GSContent").getOffsetHeight())
                 {
@@ -80 +85 @@
                 else if(y + _menuDiv.getOffsetHeight() > GS3MapLibrary.getElementById("GSFooter").getAbsoluteTop())
                 {
-                    //GS3MapLibrary.logToConsole("TRUE, " + (y + _menuDiv.getOffsetHeight()) + " is greater than " + GS3MapLibrary.getElementById("GSFooter").getAbsoluteTop());
                     _menuDiv.getElement().getStyle().setProperty("top", (y - ( y + _menuDiv.getOffsetHeight() - GS3MapLibrary.getElementById("GSFooter").getAbsoluteTop()) + "px"));
-                }
-                else
-                {
-                    //GS3MapLibrary.logToConsole("FALSE, " + (y + _menuDiv.getOffsetHeight()) + " is less than " + GS3MapLibrary.getElementById("GSFooter").getAbsoluteTop());
                 }
                 _menuDiv.setVisible(true);
@@ -111 +111 @@
     }
     
+    public void refreshMenu()
+    {
+        _parent.removeChild(_menuDiv.getElement());
+        _menuDiv = new HTML();
+        _parent.appendChild(_menuDiv.getElement());
+        _menuDiv.getElement().getStyle().setProperty("background", "#FFFFFF");
+        _menuDiv.getElement().getStyle().setProperty("padding", "2px");
+        _menuDiv.getElement().getStyle().setProperty("position", "absolute");
+        addMenuItems(_menuItems);
+    }
+    
     public void showMenu()
     {

gs3-extensions/atlas-src/trunk/src/org/greenstone/client/MenuItem.java

@@ -19 +19 @@
     }
     
+    public boolean condition()
+    {
+        return true;
+    }
+    
     public ClickHandler getClickHandler()
     {

gs3-extensions/atlas-src/trunk/src/org/greenstone/client/TemporaryFrame.java

@@ -38 +38 @@
             public void run()
             {
-                if (timerCount++ > 25)
+                if (timerCount++ > 10)
                 {
                     _doneLoading = true;

gs3-extensions/atlas-src/trunk/src/org/greenstone/server/PageScanner.java

@@ -7 +7 @@
 
 import org.greenstone.client.Place;
-
-import com.google.apphosting.utils.servlet.DatastoreViewerServlet.Page;
 
 public class PageScanner