Changeset 1102 for trunk/src/org/expeditee/items/widgets/RubbishBin.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/expeditee/items/widgets/RubbishBin.java (modified) (1 diff)

trunk/src/org/expeditee/items/widgets/RubbishBin.java

@@ -4 +4 @@
 import java.awt.event.ActionListener;
 
-import org.expeditee.gui.DisplayIO;
-import org.expeditee.gui.FrameMouseActions;
+import org.expeditee.gio.gesture.StandardGestureActions;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.FreeItems;
 import org.expeditee.items.Item;
 import org.expeditee.items.Text;
 
-//When the Rubbish Bin Widget is clicked by any of the mouse buttons, whatever is currently being picked up by the mouse is destroyed
-public class RubbishBin extends ButtonWidget{   
-                
-        public RubbishBin(Text source, String[] args){  
-                                        
+/**
+ * When the Rubbish Bin Widget is clicked by any of the mouse buttons,
+ * whatever is currently being picked up by the mouse is destroyed.
+ * 
+ * @author cts16
+ */
+public class RubbishBin extends ButtonWidget
+{       
+        public RubbishBin(Text source, String[] args)
+        {
                 super(80, "org/expeditee/assets/images/bin.svg", source, args);
 
-                clicked_.addActionListener(new ActionListener() {
-                public void actionPerformed(ActionEvent e) {    
+                clicked_.addActionListener(new ActionListener()
+                {
+                public void actionPerformed(ActionEvent e)
+                {       
                         
                 }          
-             });                
+                });             
         }
-        public boolean ItemsLeftClickDropped() {
-                
+        
+        public boolean ItemsLeftClickDropped()
+        {
                 //Find what the mouse was holding at the time and delete it
                 Item freeItems = FreeItems.getItemAttachedToCursor();
-                if( freeItems != null){
-                        freeItems.setParent(DisplayIO.getCurrentFrame());
+                
+                if( freeItems != null) {
+                        freeItems.setParent(DisplayController.getCurrentFrame());
                         
-                        try{
-                        
-                        FrameMouseActions.delete(freeItems);            
-                        }
-                        catch(Exception e){
-                                
+                        try {
+                                StandardGestureActions.delete(freeItems, null, null, false);            
+                        } catch(Exception e) {
                                 e.printStackTrace();
                         }                       
                 }
+                
                 return true;
         }
         
         @Override
-        protected String[] getArgs() {
+        protected String[] getArgs()
+        {
                 // TODO Auto-generated method stub
                 return null;
         }
-        //this should be a generic method for any widget that is clicked while an item is being held
-        public boolean itemHeldWhileClicked(InteractiveWidget iw){
-                        
+        
+        /**
+         * This should be a generic method for any widget that is clicked while an item is being held.
+         */
+        public boolean itemHeldWhileClicked(Widget iw)
+        {
                 ItemsLeftClickDropped();
-                return true;
-                        
-        }
-        public boolean getdropInteractableStatus(){
+                
                 return true;
         }
         
+        public boolean getdropInteractableStatus()
+        {
+                return true;
+        }
 }