Changeset 1102 for trunk/src/org/expeditee/io/AbstractHTMLWriter.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/io/AbstractHTMLWriter.java (modified) (4 diffs)

trunk/src/org/expeditee/io/AbstractHTMLWriter.java

@@ -19 +19 @@
 package org.expeditee.io;
 
-import java.awt.Color;
-import java.awt.Font;
 import java.io.File;
 import java.io.IOException;
@@ -26 +24 @@
 import java.util.List;
 
+import org.expeditee.core.Colour;
+import org.expeditee.core.Font;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameIO;
@@ -88 +88 @@
                         return;
 
-                writer.write(styleName + " { font-family: "
-                                + Conversion.getCssFontFamily(font.getFamily()));
+                writer.write(styleName + " { font-family: " + Conversion.getCssFontFamily(font.getFamilyName()));
 
                 // writer.write("; font-size: " + Math.round(style.getSize()) + "px");
@@ -104 +103 @@
                         writer.write("; font-style: normal");
                 }
-                Color c = style.getBackgroundColor();
+                Colour c = style.getBackgroundColor();
                 if (c != null) {
                         writer.write("; background-color: " + Conversion.getCssColor(c));