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

trunk/src/org/expeditee/items/widgets/charts/AbstractCategory.java

@@ -19 +19 @@
 package org.expeditee.items.widgets.charts;
 
-import java.awt.Color;
 import java.util.Collection;
 
+import org.expeditee.core.Colour;
+import org.expeditee.gio.swing.SwingConversions;
 import org.expeditee.gui.AttributeValuePair;
 import org.expeditee.items.Text;
@@ -49 +50 @@
                         Collection<Text> items, boolean swap) {
                 boolean foundData = false;
-                Color newColor = null;
+                Colour newColor = null;
                 for (Text i : items) {
                         try {
@@ -61 +62 @@
                                                                         categoryName);
                                                         if (_paints.get(attribute) == null) {
-                                                                _paints.put(attribute, i.getBackgroundColor());
+                                                                _paints.put(attribute, SwingConversions.toSwingColor(i.getBackgroundColor()));
                                                         }
                                                 } else {
@@ -77 +78 @@
                 }
                 if (foundData && !swap) {
-                        _paints.put(categoryName, newColor);
+                        _paints.put(categoryName, SwingConversions.toSwingColor(newColor));
                 }
                 return foundData;