Changeset 26734 for other-projects/GlamED/trunk/src/org/honours/gui/Interfaces.java

Timestamp:

2013-01-16T20:07:37+13:00 (11 years ago)

Author:

davidb

Message:

General refactoring.

File:

• other-projects/GlamED/trunk/src/org/honours/gui/Interfaces.java (modified) (7 diffs)

other-projects/GlamED/trunk/src/org/honours/gui/Interfaces.java

@@ -4 +4 @@
 import java.util.List;
 
+import org.expeditee.actions.Misc;
 import org.expeditee.gui.*;
 import org.expeditee.items.Item;
@@ -20 +21 @@
     //various frame names for the different interface overlays.
     public static final String MAIN_INTERFACE_OVERLAY = "interface-overlays1";
-    public static final String NAVIGATION_OVERLAY = "interface-overlays2";
+    
     public static final String LAYERS_BACK_BTN_OVERLAY = "interface-overlays3";
     public static final String TOGGLE_TOOLS_OVERLAY = "interface-overlays4";
+
+    public static final String BLANK_TOOLBAR_OVERLAY = "interface-overlays6";
+    
+    //overlay displaying toolbar with "View Notes" option DISABLED.
+    public static final String NAVIGATION_OVERLAY_VIEW_NOTES_UNCLICKABLE = "interface-overlays2";
+    
+    //overlay displaying toolbar with "View Notes" option ENABLED.
+    public static final String NAVIGATION_OVERLAY_VIEW_NOTES_CLICKABLE = "interface-overlays11";
+    
     //public static final String DISPLAY_LAYERS_OVERLAY = "interface-overlays5";
-    public static final String BLANK_TOOLBAR_OVERLAY = "interface-overlays6";
     //public static final String BLANK_DISPLAY_LAYERS_OVERLAY = "interface-overlays7";
     
@@ -48 +57 @@
     private static int _notesAoY = 58;
     
-    private static String _overlayAnnotationData = "overlay-annotation";
+    public static final String OVERLAY_TOOLBAR_DATA = "overlayToolbar";
     
     /**
@@ -137 +146 @@
                 
                 if(t.hasLink()){
-                    if(t.getLink().equals(NAVIGATION_OVERLAY)){
+                    if(t.getLink().equals(NAVIGATION_OVERLAY_VIEW_NOTES_UNCLICKABLE)){
                         found = true;
                     }
@@ -149 +158 @@
             
             Text newText = ciFrame.addText(_toolbarAoX,_toolbarAoY,AO_TEXT3,null);
-            newText.setData("overlayToolbar");
-            newText.setLink(NAVIGATION_OVERLAY);
+            newText.setData(OVERLAY_TOOLBAR_DATA);
+            newText.setLink(NAVIGATION_OVERLAY_VIEW_NOTES_UNCLICKABLE);
         }
     
@@ -216 +225 @@
                     }
                     
-                }
-            }
-            
-            i++;
-        }
-        
-        if(!found){
+                    
+                }
+            }
+            
+            i++;
+        }
+        
+        if(!found){
+            
+                
             
             //check for an overlay frame in notes frameset associated with this collection item.
@@ -259 +271 @@
             newText.setData("overlayNotes");
             newText.setLink(getNotesOverlayFrame.getName());
+        }else{
+            
+            //Obtain link to toolbar and change it.
+            Item getToolbarLinkItem = Misc.getItemContainingData(OVERLAY_TOOLBAR_DATA, ciFrame);
+            
+            if(getToolbarLinkItem.getLink().equals(NAVIGATION_OVERLAY_VIEW_NOTES_UNCLICKABLE))
+                getToolbarLinkItem.setLink(NAVIGATION_OVERLAY_VIEW_NOTES_CLICKABLE);
+            
         }
     }