Changeset 26737 for other-projects/GlamED

Timestamp:

2013-01-16T20:12:03+13:00 (11 years ago)

Author:

davidb

Message:

Refactoring of interfaces class.

File:

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

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

@@ -1 +1 @@
 package org.honours.gui;
 
+import java.awt.Color;
 import java.awt.Dimension;
 import java.util.List;
@@ -45 +46 @@
 
     //used to determine positioning of the various @ao:3/4 text items.
-    private static int _mainOverAoX = 1272;
+    private static int _mainOverAoX = 1859;
     private static int _mainOverAoY = 130;
     
-    private static int _toolbarAoX = 1272;
+    private static int _toolbarAoX = 1859;
     private static int _toolbarAoY = 130;
     
-    private static int _toggleAoX = 1272;
+    private static int _toggleAoX = 1859;
     private static int _toggleAoY = 94;
     
-    private static int _notesAoX = 1272;
+    private static int _notesAoX = 1859;
     private static int _notesAoY = 58;
     
@@ -211 +212 @@
         
         boolean found = false;
+        String notesFrameFoundName = null;
         int i = 0;
         
+            
         while(i < list.size() && !found){
             
@@ -223 +226 @@
                     if(t.getLink().startsWith("notes")){
                         found = true;
+                        notesFrameFoundName = t.getLink();
                     }
                     
@@ -233 +237 @@
         
         if(!found){
-            
-                
-            
+
             //check for an overlay frame in notes frameset associated with this collection item.
             NoteLayer getNoteLayer = cItem.getNoteLayer();
@@ -253 +255 @@
                 cItem.setNoteLayer(getNoteLayer);
                 
-                //Add collectionItem back into collection
-                //Add collection back into collections list
+                //Add collectionItem back into collection and add collection back into collections list
                 Collection matchingCollection = Collection.findCollection(cItem.getFrame());
                 int collectionIndex = Collection.getCollectionPosition(matchingCollection);
@@ -264 +265 @@
                 Main._collections.remove(collectionIndex);
                 Main._collections.add(collectionIndex, matchingCollection);
+                
             }else{
                 getNotesOverlayFrame = getNoteLayer.getFrame();
@@ -271 +273 @@
             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);
+            Item toolbarLinkItem = Misc.getItemContainingData(OVERLAY_TOOLBAR_DATA, ciFrame);
+            String toolbarOverlayLink = toolbarLinkItem.getLink();
+            
+            if(toolbarOverlayLink.equals(NAVIGATION_OVERLAY_VIEW_NOTES_UNCLICKABLE)){
+                toolbarLinkItem.setLink(NAVIGATION_OVERLAY_VIEW_NOTES_CLICKABLE);
+            }
+            else if(toolbarOverlayLink.equals(NAVIGATION_OVERLAY_VIEW_NOTES_CLICKABLE)){
+                //Check for actual text items on the notes frame.
+                Frame checkOverlayFrame = FrameIO.LoadFrame(notesFrameFoundName);
+                
+                if(checkOverlayFrame.getTextItems().size() == 0){
+                    toolbarLinkItem.setLink(NAVIGATION_OVERLAY_VIEW_NOTES_UNCLICKABLE);
+                    System.err.println("NO NOTES for collection item: " + ciFrame.getName());
+                }else{
+                    System.err.println(ciFrame.getName() + " " + checkOverlayFrame.getTextItems().size() + " ********");
+                }
+                
+            }
             
         }