Changeset 997

Timestamp:

02/05/16 09:33:19 (8 years ago)

Author:

davidb

Message:

Added new version of FrameIO

Location:

trunk/src/org/expeditee/gui

Files:

• Browser.java (modified) (1 diff)
• Frame.java (modified) (2 diffs)
• FrameGraphics.java (modified) (1 diff)
• FrameIO.java (modified) (5 diffs)
• FrameMouseActions.java (modified) (11 diffs)
• FrameUtils.java (modified) (3 diffs)

trunk/src/org/expeditee/gui/Browser.java

@@ -197 +197 @@
             try
         {
-          URL iconURL = ClassLoader.getSystemResource("org/expeditee/assets/icons/expediteeicon128.png");
+          URL iconURL = ClassLoader.getSystemResource("org/expeditee/assets/icons/expediteeicon128.png"); //this is ideal
           if (iconURL != null)
           {

trunk/src/org/expeditee/gui/Frame.java

@@ -2370 +2370 @@
                  * every time this method is called
                  */
-                if (_interactableItems.size() > 0)
-                        return _interactableItems;
+                //if (_interactableItems.size() > 0)
+                //      return _interactableItems;
 
                 for (Item i : _body) {
@@ -2384 +2384 @@
                 for (Item i : _overlayItems) {
                         if (i.hasPermission(UserAppliedPermission.followLinks)) {
-                                _interactableItems.add(i);
-                        }
+                                _interactableItems.add(i);      
+                        }
+                        
+                        
                 }
 

trunk/src/org/expeditee/gui/FrameGraphics.java

@@ -72 +72 @@
         // Start in XRay mode so that errors aren't thrown when parsing the profile
         // frame if it has images on it
-        private static int _Mode = MODE_XRAY;
+        private static int _Mode = MODE_AUDIENCE;
 
         private FrameGraphics() {

trunk/src/org/expeditee/gui/FrameIO.java

@@ -32 +32 @@
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.nio.channels.FileChannel;
 import java.sql.Time;
 import java.util.Collection;
@@ -214 +215 @@
         }
 
+        //Loads the 'restore' version of a frame if there is one
+                public static Frame LoadRestoreFrame(Frame frameToRestore) {                    
+                        
+                        String fullPath = getFrameFullPathName(frameToRestore.getPath(), frameToRestore
+                                        .getName());
+                        //System.out.println("fullpath: " + fullPath);
+                        String restoreVersion = fullPath + ".restore";
+                        //System.out.println("restoreversion" + restoreVersion);
+                        File source = new File(restoreVersion);
+                        File dest = new File(fullPath);
+                        
+                        FileChannel inputChannel = null;
+                        FileChannel outputChannel = null;
+                        
+                        try{
+                                        FileInputStream source_fis = new FileInputStream(source);
+                                        inputChannel = source_fis.getChannel();
+                                        
+                                        FileOutputStream dest_fos = new FileOutputStream(dest);
+                                        outputChannel = dest_fos.getChannel();
+                                        
+                                        outputChannel.transferFrom(inputChannel, 0, inputChannel.size());
+                                        inputChannel.close();
+                                        outputChannel.close();
+                                        source_fis.close();
+                                        dest_fos.close();
+                        }                
+                        catch(Exception e){
+                                
+                                System.err.println("No restore point detected.");
+                        }
+                        String frameName = frameToRestore.getName();
+                        String frameNameLower = frameName.toLowerCase();
+                        
+                        // first try reading from cache
+                        if (isCacheOn() && _Cache.containsKey(frameNameLower)) {
+                                Logger.Log(Logger.SYSTEM, Logger.LOAD, "Clearing " + frameName
+                                                + " from cache.");
+                                Frame frame = _Cache.get(frameNameLower);
+                                _Cache.remove(frameNameLower);                          
+                        }
+                        
+                        return LoadFrame(frameName, frameToRestore.getPath(), true);
+                }               
+                
         public static BufferedReader LoadPublicFrame(String frameName) {
                 String fullPath = FrameIO.getFrameFullPathName(PUBLIC_PATH, frameName);
@@ -294 +340 @@
         public static synchronized String getFrameFullPathName(String path,
                         String frameName) {
-                String source = path + Conversion.getFramesetName(frameName)
-                                + File.separator;
+                
+                String source;
+                String fileName = null;
+                if(frameName.contains("restore")){
+                        source = path + File.separator;// + frameName;
+                        fileName = path + File.separator + frameName + ExpReader.EXTENTION;
+                        
+                }
+                else
+                {
+                        source = path + Conversion.getFramesetName(frameName)
+                        + File.separator;
+                }
+        
 
                 File tester = new File(source);
@@ -301 +359 @@
                         return null;
 
-                // check for the new file name format
-                String fullPath = source + Conversion.getFrameNumber(frameName)
-                                + ExpReader.EXTENTION;
+                String fullPath;
+                
+                if(frameName.contains("restore")){
+                        
+                        fullPath = fileName;
+                }
+                else
+                {
+                        // check for the new file name format
+                        fullPath = source + Conversion.getFrameNumber(frameName)
+                        + ExpReader.EXTENTION;
+                }               
+                
                 tester = new File(fullPath);
 
@@ -1022 +1090 @@
 
         /**
+         * Saves the given Frame to disk in the corresponding frameset directory as a RESTORE, if
+         * inc is true then the saved frames counter is incremented, otherwise it is
+         * untouched.
+         * 
+         * @param toSave
+         *            The Frame to save to disk as the DEFAULT COPY
+         * @param inc
+         *            True if the saved frames counter should be incremented, false
+         *            otherwise.
+         * @param checkBackup
+         *            True if the frame should be checked for the back up tag
+         */
+        public static String SaveFrameAsRestore(Frame toSave, boolean inc,
+                        boolean checkBackup) {
+                
+                String sf = SaveFrame(toSave, inc, checkBackup);                
+                String originalFrameName = toSave.getFramesetName();
+                //System.out.println(originalFrameName + " : " + toSave.getPath());
+                String fullPath = getFrameFullPathName(toSave.getPath(), toSave
+                                .getName());
+                //System.out.println(fullPath);
+                String restoreVersion = fullPath + ".restore";
+                File source = new File(fullPath);
+                File dest = new File(restoreVersion);
+                
+                FileChannel inputChannel = null;
+                FileChannel outputChannel = null;
+                
+                try{
+                                FileInputStream source_fis = new FileInputStream(source);
+                                inputChannel = source_fis.getChannel();
+                                
+                                FileOutputStream dest_fos = new FileOutputStream(dest);
+                                outputChannel = dest_fos.getChannel();
+                                
+                                outputChannel.transferFrom(inputChannel, 0, inputChannel.size());
+                                inputChannel.close();
+                                outputChannel.close();
+                                source_fis.close();
+                                dest_fos.close();
+                }                
+                catch(Exception e){
+                        e.printStackTrace();
+                }                       
+                
+                return sf;
+        }
+        
+        /**
          * @param toAdd
          */

trunk/src/org/expeditee/gui/FrameMouseActions.java

@@ -44 +44 @@
 import java.util.List;
 import java.util.Set;
+import java.util.TimerTask;
 
 import javax.swing.Timer;
@@ -53 +54 @@
 import org.expeditee.gui.indirect.mouse.MouseAction;
 import org.expeditee.gui.indirect.mouse.MouseInfo;
+import org.expeditee.gui.Frame;
 import org.expeditee.io.ExpClipReader;
 import org.expeditee.io.ItemSelection;
@@ -68 +70 @@
 import org.expeditee.items.UserAppliedPermission;
 import org.expeditee.items.XRayable;
+import org.expeditee.items.widgets.ButtonWidget;
 import org.expeditee.items.widgets.InteractiveWidget;
 import org.expeditee.items.widgets.WidgetCorner;
@@ -83 +86 @@
 
         private boolean _autoStamp = false;
-
+        
         private FrameMouseActions() {
                 IndirectMouseActions.getInstance().setBackAction(new MouseAction() {
@@ -898 +901 @@
                 int buttonPressed = e.getButton();
                 _mouseDown += buttonPressed;
+                //when border of bin is clicked we can pick up the widget has been clicked
                 _lastClickedOn = FrameUtils.getCurrentItem();
                 // load any frame if necessary
@@ -1345 +1349 @@
         private void leftButton(Item clicked, Collection<Item> clickedIn,
                         boolean isShiftDown, boolean isControlDown) {
+                
+                //Gets the current frame
+                Frame f = DisplayIO.getCurrentFrame();
+                
+                //Checks if the current frame is an overlay
+                if(f.getOverlays() != null && FrameUtils.getCurrentItem() != null){
+                        Item i = FrameUtils.getCurrentItem();
+                        
+                        //Checks if the item clicked in the overlay is a Rubbish Bin. If it is, delete the item attached to the cursor and return.
+                        if(i instanceof WidgetCorner){
+                                
+                                try{
+                                        WidgetCorner wc = (WidgetCorner)i;                                      
+                                        ButtonWidget bw = (ButtonWidget) wc.getWidgetSource();
+                                        
+                                        //Should call a button widgets 'itemheldwhileclicked' method, and process depending on the widget type - else will return false.
+                                        if(bw.itemHeldWhileClicked((InteractiveWidget)bw) == true){             
+                                        //if(bw.ItemsLeftClickDropped() == true){                                               
+                                                
+                                                return;
+                                        }                               
+                                }
+                                catch (Exception e){
+                                        
+                                        e.printStackTrace();
+                                }
+                        }
+                        
+                        Item on = _lastClickedOn;
+                        _lastClickedIn = FrameUtils.getCurrentItems(on);
+                }
+                
 
                 // if the user is pointing at something then either follow the link or
@@ -1354 +1390 @@
                         // System.out.println(mouseX + "," + mouseY);
                         for (Item i : DisplayIO.getCurrentFrame().getItems()) {
+                                //System.out.println(i.getName().toString());
                                 if (i instanceof Text) {
                                         if (i.isNear(mouseX, mouseY)) {
@@ -1377 +1414 @@
                                 && _lastClickedIn.size() >= 4) {
 
-                        // Check to see if the use clicked into a widgets empty space
+                        // Check to see if the user clicked into a widgets empty space
                         InteractiveWidget iw = null;
 
@@ -1398 +1435 @@
                                 }
                                 
-                                // Note: musten't directly use source for handling the link
+                                // Note: mustn't directly use source for handling the link
                                 // because all link operations will by-pass the widgets special
                                 // handling with links...
@@ -2296 +2333 @@
         }
 
+        
         public void refreshHighlights() {
                 // ByMike: Get the item the mouse is hovering over
@@ -2342 +2380 @@
                                 // Item.SelectedMode.Connected);
                                 // TODO: The method below is for the most part redundant
+                                
+                                //start a timer to check how long mouse hovers over item for
+                                //java.util.Timer timer = new java.util.Timer();
+                                //timer.schedule(new TimerTask() {
+                                          //@Override
+                                          //public void run() {
+                                            
+                                                  //System.out.println("The mouse hovered over an item for 3 seconds");
+                                         //}
+                                        //}, 10000);
+                                
+                                
+                                
+                                
                                 on = FrameGraphics.Highlight(on.getEditTarget());
                         }

trunk/src/org/expeditee/gui/FrameUtils.java

@@ -59 +59 @@
 import org.expeditee.items.UserAppliedPermission;
 import org.expeditee.items.XRayable;
+import org.expeditee.items.widgets.ButtonWidget;
 import org.expeditee.items.widgets.InteractiveWidget;
 import org.expeditee.items.widgets.InteractiveWidgetInitialisationFailedException;
 import org.expeditee.items.widgets.InteractiveWidgetNotAvailableException;
+import org.expeditee.items.widgets.RubbishBin;
 import org.expeditee.items.widgets.WidgetCorner;
 import org.expeditee.items.widgets.WidgetEdge;
@@ -1222 +1224 @@
             checkList.addAll(toCheck.getInteractableItems());
             checkList.add(toCheck.getNameItem());
+            
             for (Item i : checkList) {
+                        
                 // do not check annotation items in audience mode
                 if (i.isVisible()
                         && !(FrameGraphics.isAudienceMode() && i.isAnnotation())) {
-                    if (i.contains(x, y)
-                            && !FreeItems.getInstance().contains(i)) {
-                        possibles.add(i);
+                        if(i instanceof WidgetCorner){
+                                WidgetCorner wc = (WidgetCorner)i;
+                                if(wc.getWidgetSource() instanceof ButtonWidget){
+                                        ButtonWidget bw = (ButtonWidget) wc.getWidgetSource();
+                                        
+                                        if(bw.getdropInteractableStatus() == true){
+                                                InteractiveWidget iw = wc.getWidgetSource();
+                                                
+                                                if(iw.getBounds().contains(x, y)){
+                                                        
+                                                        if( !FreeItems.getInstance().contains(i))
+                                                {
+                                                                possibles.add(i);                                                       
+                                                }
+                                                }       
+                                        }
+                                        
+                                }
+                                
+                }
+
+                    if (i.contains(x, y)){
+                        if( !FreeItems.getInstance().contains(i))
+                        {
+                                possibles.add(i);                               
+                        }
                     }
+                           
                 }
             }
@@ -1263 +1291 @@
             }
 
-        }
+        }       
 
         return closest;