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

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

@@ -19 +19 @@
 package org.expeditee.items.widgets;
 
-import java.awt.Color;
-import java.awt.Graphics;
 import java.util.Collection;
 import java.util.HashSet;
@@ -26 +24 @@
 import javax.swing.JComponent;
 
-import org.expeditee.gui.DisplayIO;
+import org.expeditee.core.Colour;
+import org.expeditee.core.Point;
+import org.expeditee.gio.EcosystemManager;
+import org.expeditee.gio.GraphicsManager;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameIO;
@@ -34 +36 @@
 import org.expeditee.items.Text;
 
-public abstract class DataFrameWidget extends InteractiveWidget implements
+public abstract class DataFrameWidget extends SwingWidget implements
                 FrameObserver {
 
@@ -118 +120 @@
         public void update() {
                 Frame parent = getParentFrame();
-                if (parent != null && parent == DisplayIO.getCurrentFrame()) {
+                if (parent != null && parent == DisplayController.getCurrentFrame()) {
                         refresh();
                 }
@@ -166 +168 @@
         }
 
-        protected void paintInFreeSpace(Graphics g) {
-                super.paintInFreeSpace(g);
-                g.setFont(((Text) getSource()).getFont());
-                g.setColor(Color.WHITE);
-                g.drawString(this.getClass().getSimpleName(), getX() + 10, getY() + 20);
+        protected void paintInFreeSpace()
+        {
+                super.paintInFreeSpace();
+                GraphicsManager g = EcosystemManager.getGraphicsManager();
+                g.drawString(this.getClass().getSimpleName(), new Point(getX() + 10, getY() + 20), ((Text) getSource()).getFont(), Colour.WHITE);
 
         }