Changeset 1102 for trunk/src/org/expeditee/items/widgets/ButtonWidget.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/ButtonWidget.java (modified) (6 diffs)

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

@@ -1 +1 @@
 package org.expeditee.items.widgets;
 import java.awt.BorderLayout;
-import java.awt.Color;
 import java.awt.Dimension;
 import java.net.URL;
@@ -9 +8 @@
 import javax.swing.border.EmptyBorder;
 
+import org.expeditee.core.Colour;
+import org.expeditee.gio.swing.SwingConversions;
 import org.expeditee.items.Text;
 
@@ -14 +15 @@
 
 //Will be the default class for Rubbish Bin, Reset and Undo Button Widgets
-public class ButtonWidget extends InteractiveWidget{
-
+public class ButtonWidget extends SwingWidget
+{
         protected JButton clicked_ = new JButton("");   
         protected SVGIcon icon_ = null;
-        
+
         public ButtonWidget(int dimension, String filePath, Text source, String[] args)
         {
@@ -25 +26 @@
                                 
                 clicked_.setBorder(new EmptyBorder(0, 0, 0, 0));
-                clicked_.setBackground(Color.white);
+                clicked_.setBackground(SwingConversions.toSwingColor(Colour.WHITE));
                 
                 Dimension size = new Dimension(dimension, dimension);
                 icon_ = new SVGIcon();
-                try{
+                
+                try {
                         URL imageURL = ClassLoader.getSystemResource(filePath);         
                         icon_.setSvgURI(imageURL.toURI());
-                        //This STILL works, unsure why. Don't remove it has an affect on the button appearance.         
+                        // This STILL works, unsure why. Don't remove it has an affect on the button appearance.
                         icon_.setUseAntiAlias(true);
                         icon_.setScaleToFit(true);
@@ -39 +41 @@
                         _swingComponent.add(clicked_);
                         this.setWidgetEdgeThickness(0.0f);
-                        this.setWidgetEdgeColor(Color.white);   
-                }
-                catch(Exception e){
-                        
+                        this.setWidgetEdgeColor(Colour.WHITE);  
+                } catch(Exception e) {
                         //Set a default image if image is missing
                         System.out.println("Unable to load image from directory");                      
@@ -49 +49 @@
 
         @Override
-        protected String[] getArgs() {
+        protected String[] getArgs()
+        {
                 // TODO Auto-generated method stub
                 return null;
         }
-        public boolean itemHeldWhileClicked(InteractiveWidget bw) {
+        
+        public boolean itemHeldWhileClicked(Widget bw)
+        {
                 // TODO Auto-generated method stub
                 return false;
         }
-        public boolean getdropInteractableStatus(){
+        
+        public boolean getdropInteractableStatus()
+        {
                 return false;
         }
 
         @Override
-        boolean setPositions(WidgetCorner src, float x, float y) {
+        public boolean setPositions(WidgetCorner src, float x, float y)
+        {
                 boolean result = super.setPositions(src, x, y);