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

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

@@ -19 +19 @@
 package org.expeditee.io;
 
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
@@ -45 +42 @@
 import javafx.beans.value.ObservableValue;
 import javafx.concurrent.Worker.State;
-import javafx.embed.swing.SwingFXUtils;
 import javafx.scene.SnapshotParameters;
 import javafx.scene.image.WritableImage;
@@ -51 +47 @@
 import javafx.scene.web.WebView;
 
-import javax.imageio.ImageIO;
-
 import netscape.javascript.JSObject;
 
-import org.expeditee.gui.DisplayIO;
+import org.expeditee.core.Colour;
+import org.expeditee.core.Font;
+import org.expeditee.core.Image;
+import org.expeditee.core.InOutReference;
+import org.expeditee.gio.EcosystemManager;
+import org.expeditee.gio.gesture.StandardGestureActions;
+import org.expeditee.gio.swing.SwingMiscManager;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
-import org.expeditee.gui.FrameMouseActions;
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.MessageBay;
@@ -303 +302 @@
                 try {
                         
-                        final int verticalScrollPerPage = (int) (FrameGraphics.getMaxFrameSize().getHeight() * 0.85);
-                        final int horizontalScrollPerPage = (int) (FrameGraphics.getMaxFrameSize().getWidth() * 0.85);
+                        final int verticalScrollPerPage = (int) (DisplayController.getFramePaintArea().getHeight() * 0.85);
+                        final int horizontalScrollPerPage = (int) (DisplayController.getFramePaintArea().getWidth() * 0.85);
                                                 
                         Platform.runLater(new Runnable() {
@@ -320 +319 @@
                         final Object notifier = new Object();
                                                 
-                        final MutableInt verticalCount = new MutableInt(0);
-                        final MutableInt horizontalCount = new MutableInt(0);
+                        final InOutReference<Integer> verticalCount = new InOutReference<Integer>(0);
+                        final InOutReference<Integer> horizontalCount = new InOutReference<Integer>(0);
                         
-                        final MutableInt pagesVertical = new MutableInt(1);
-                        final MutableInt pagesHorizontal = new MutableInt(1);
+                        final InOutReference<Integer> pagesVertical = new InOutReference<Integer>(1);
+                        final InOutReference<Integer> pagesHorizontal = new InOutReference<Integer>(1);
 
                         final String pageTitle;
@@ -341 +340 @@
                         frameset.getTitleItem().setSize(14);
 
-                        WebParser.addButton("Return to original frame", frame.getName(), null, 200, frameset, null, 0f, 10f, null);
-
-                        Text link = DisplayIO.getCurrentFrame().addText(FrameMouseActions.getX(), FrameMouseActions.getY(), pageTitle, null);
+                        WebParser.addButton("Return to original frame", frame.getName(), null, 200, frameset, null, 0, 10, null);
+
+                        Text link = DisplayController.getCurrentFrame().addText(DisplayController.getMouseX(), DisplayController.getMouseY(), pageTitle, null);
                         link.setLink(frameset.getName());
 
-                        FrameMouseActions.pickup(link);
+                        StandardGestureActions.pickup(link);
 
                         // Timer that fires every time JFX is redrawn. After a few redraws, the handle method of this takes a screenshot of the page,
@@ -364 +363 @@
                                                 this.stop();
                                                 
-                                                verticalCount.setValue(verticalCount.getValue() + 1);
+                                                verticalCount.set(verticalCount.get() + 1);
 
                                                 frameToAddTo = FrameIO.CreateFrame(frameToAddTo.getFramesetName(), pageTitle, null);
@@ -395 +394 @@
 
                                                 // Getting a BufferedImage from the JavaFX image
-                                                BufferedImage image = SwingFXUtils.fromFXImage(img, null);
+                                                //BufferedImage image = SwingFXUtils.fromFXImage(img, null);
+                                                Image image = SwingMiscManager.getImageForJavaFXImage(img);
 
                                                 try {
-                                                        int hashcode = Arrays.hashCode(image.getData().getPixels(0, 0, image.getWidth(), image.getHeight(), (int[]) null));
-
+                                                        // TODO: tidy. cts16
+                                                        //int hashcode = Arrays.hashCode(image.getData().getPixels(0, 0, image.getWidth(), image.getHeight(), (int[]) null));
+                                                        int hashcode = image.hashCode();
+                                                        
                                                         File out = new File(FrameIO.IMAGES_PATH + "webpage-" + Integer.toHexString(hashcode) + ".png");
                                                         out.mkdirs();
-                                                        ImageIO.write(image, "png", out);
+                                                        image.writeToDisk("png", out);
 
                                                         // Adding the image to the frame
@@ -408 +410 @@
                                                         
                                                         // Adding thumbnail to the overview page
-                                                        Text thumb = frameset.addText((int) (thumbWidth * 1.1 * horizontalCount.getValue()) + 10,
-                                                                        (int) ((((float) thumbWidth / image.getWidth()) * image.getHeight()) * 1.1 * verticalCount.getValue()),
+                                                        Text thumb = frameset.addText((int) (thumbWidth * 1.1 * horizontalCount.get()) + 10,
+                                                                        (int) ((((float) thumbWidth / image.getWidth()) * image.getHeight()) * 1.1 * verticalCount.get()),
                                                                         "@i: " + out.getName() + " " + thumbWidth, 
                                                                         null);
                                                         
                                                         thumb.setLink(frameToAddTo.getName());
-                                                        thumb.setBorderColor(Color.lightGray);
+                                                        thumb.setBorderColor(Colour.LIGHT_GREY);
                                                         thumb.setThickness(1);
 
                                                         // Button to go to the next frame/page
-                                                        WebParser.addButton("Next", null, "next", 70, frameToAddTo, null, 0f, 10f, null);
+                                                        WebParser.addButton("Next", null, "next", 70, frameToAddTo, null, 0, 10, null);
 
                                                         // Button to go to the previous frame/page
-                                                        if (verticalCount.getValue() > 1 || horizontalCount.getValue() > 0) {
-                                                                WebParser.addButton("Previous", null, "previous", 70, frameToAddTo, null, 85f, 10f, null);
+                                                        if (verticalCount.get() > 1 || horizontalCount.get() > 0) {
+                                                                WebParser.addButton("Previous", null, "previous", 70, frameToAddTo, null, 85, 10, null);
                                                         }
 
                                                         // Button to return to the index/overview page
-                                                        WebParser.addButton("Index", frameset.getName(), null, 70, frameToAddTo, null, null, 10f, 5f);
+                                                        WebParser.addButton("Index", frameset.getName(), null, 70, frameToAddTo, null, null, 10, 5);
 
                                                         FrameIO.SaveFrame(frameToAddTo);
@@ -435 +437 @@
                                                 }
 
-                                                image.flush();
+                                                image.releaseImage();
 
                                                 synchronized (notifier) {
@@ -468 +470 @@
                                                 // but if the webpage fits in a single converted page, there's no need for any overlap, so just use 1 as the number of pages
                                                 if((Boolean) webEngine.executeScript("document.documentElement.scrollHeight > window.innerHeight")) {
-                                                        pagesVertical.setValue((int) Math.ceil((Integer) webEngine.executeScript("document.documentElement.scrollHeight") / (float) verticalScrollPerPage));
+                                                        pagesVertical.set((int) Math.ceil((Integer) webEngine.executeScript("document.documentElement.scrollHeight") / (float) verticalScrollPerPage));
                                                 }
                                                 
                                                 if((Boolean) webEngine.executeScript("document.documentElement.scrollWidth > window.innerWidth")) {
-                                                        pagesHorizontal.setValue((int) Math.ceil((Integer) webEngine.executeScript("document.documentElement.scrollWidth") / (float) horizontalScrollPerPage));
+                                                        pagesHorizontal.set((int) Math.ceil((Integer) webEngine.executeScript("document.documentElement.scrollWidth") / (float) horizontalScrollPerPage));
                                                 }
                                                 
                                                 System.out.println(webEngine.executeScript("document.documentElement.scrollWidth") + "/" + horizontalScrollPerPage);
-                                                System.out.println(pagesVertical.getValue() + "x" + pagesHorizontal.getValue());
+                                                System.out.println(pagesVertical.get() + "x" + pagesHorizontal.get());
                                                 
                                                 // Setting up the element that contains the CSS to hide all text. Also hiding readability mode buttons.
@@ -628 +630 @@
 
                         // Loop that scrolls the page horizontally
-                        for(int i = 0; i < pagesHorizontal.getValue() && browserWidget.isParserRunning(); i++) {
+                        for(int i = 0; i < pagesHorizontal.get() && browserWidget.isParserRunning(); i++) {
                                                                 
                                 Platform.runLater(new Runnable() {
@@ -647 +649 @@
                                 
                                 // Loop that scrolls the page vertically (for each horizontal scroll position)
-                                for(int j = 0; j < pagesVertical.getValue()  && browserWidget.isParserRunning(); j++) {
+                                for(int j = 0; j < pagesVertical.get()  && browserWidget.isParserRunning(); j++) {
                                         
                                         try {
-                                                progressBar.set((int) (50 + ((float)(j+1)/(pagesVertical.getValue() * pagesHorizontal.getValue())  + ((float)(i) / pagesHorizontal.getValue())) * 50));
+                                                progressBar.set((int) (50 + ((float)(j+1)/(pagesVertical.get() * pagesHorizontal.get())  + ((float)(i) / pagesHorizontal.get())) * 50));
                                         } catch (Exception e) {
                                                 e.printStackTrace();
@@ -698 +700 @@
                                 }
 
-                                horizontalCount.setValue(horizontalCount.getValue() + 1);
-                                verticalCount.setValue(0);
+                                horizontalCount.set(horizontalCount.get() + 1);
+                                verticalCount.set(0);
                         }
 
@@ -742 +744 @@
          * @return A Color object that should match the rgb string passed int. Returns null if alpha is 0
          */
-        private static Color rgbStringToColor(String rgbString) {
+        private static Colour rgbStringToColor(String rgbString) {
 
                 if (rgbString == null) {
@@ -764 +766 @@
 
                 if (components[3] > 0) {
-                        return new Color(components[0], components[1], components[2], components[3]);
+                        return Colour.FromRGBA255(components[0], components[1], components[2], components[3]);
                 } else {
                         return null;
@@ -854 +856 @@
 
                                         Boolean fontFound = false;
-                                        Font font = new Font(null);
+                                        Font font = null;
 
                                         // Looping through all font-families listed in the element's CSS until one that is installed is
@@ -869 +871 @@
                                                 
                                                 // Regex will remove any inverted commas surrounding multi-word typeface names
-                                                font = new Font(typefaces[j].replaceAll("^'|'$", ""), Font.PLAIN, 12);
-                                                
-                                                // If the font isn't found, Java just uses Font.DIALOG, so this check checks whether the font was found
-                                                if (!(font.getFamily().toLowerCase().equals(Font.DIALOG.toLowerCase()))) {
+                                                String familyName = typefaces[j].replaceAll("^'|'$", "");
+                                                font = new Font(familyName);
+                                                font.setStyle(Font.Style.PLAIN);
+                                                font.setSize(12);
+                                                
+                                                // Check whether the font was found
+                                                if (EcosystemManager.getFontManager().getActualFont(font).getFamilyName().toLowerCase().equals(familyName.toLowerCase())) {
                                                         fontFound = true;
                                                 }
                                         }
 
-                                        if (font.getFamily().toLowerCase().equals(Font.DIALOG.toLowerCase())) {
-                                                font = new Font("Times New Roman", Font.PLAIN, 12);
+                                        if (!fontFound) {
+                                                font = new Font("Times New Roman");
+                                                font.setStyle(Font.Style.PLAIN);
+                                                font.setSize(12);
                                         }
 
@@ -975 +982 @@
                                         String bgColorString = (String) style.call("getPropertyValue", new Object[] { "background-color" });
 
-                                        Color bgColor = rgbStringToColor(bgColorString);
+                                        Colour bgColor = rgbStringToColor(bgColorString);
 
                                         // If the element has a background color then add it (to Expeditee) as a rectangle with that background color
@@ -1077 +1084 @@
                 HttpURLConnection connection = (HttpURLConnection) (imgUrl.openConnection());
 
-                // Spoofing a widely accepted User Agent, since some sites refuse to serve non-webbrowser clients
-                connection.setRequestProperty("User-Agent", "Mozilla/5.0");
-
-                BufferedImage img = ImageIO.read(connection.getInputStream());
-
-                int hashcode = Arrays.hashCode(img.getData().getPixels(0, 0, img.getWidth(), img.getHeight(), (int[]) null));
+                Image img = Image.getImage(connection);
+                
+                int hashcode = img.hashCode();
+                
                 File out = new File(FrameIO.IMAGES_PATH + Integer.toHexString(hashcode) + ".png");
                 out.mkdirs();
-                ImageIO.write(img, "png", out);
+                img.writeToDisk("png", out);
 
                 if (repeat == null && cropEndX == null && cropStartX == null && cropEndY == null && cropStartY == null) {
@@ -1153 +1158 @@
                 text.setPosition(x, y);
 
-                Picture pic = ItemUtils.CreatePicture(text, frame);
+                Picture pic = ItemUtils.CreatePicture(text);
                 
                 float invScale = 1 / pic.getScale();
@@ -1324 +1329 @@
 
                                 Boolean fontFound = false;
-                                Font font = new Font(null);
+                                Font font = null;
 
                                 // Looping through all font-families listed in the element's CSS until one that is installed is
@@ -1342 +1347 @@
 
                                         // Regex will remove any inverted commas surrounding multi-word typeface names
-                                        font = new Font(typefaces[j].replaceAll("^'|'$", ""), Font.PLAIN, 12);
+                                        String familyName = typefaces[j].replaceAll("^'|'$", "");
+                                        font = new Font(familyName);
+                                        font.setStyle(Font.Style.PLAIN);
+                                        font.setSize(12);
 
                                         // If the font isn't found, Java just uses Font.DIALOG, so this check checks whether the font was found
-                                        if (!(font.getFamily().toLowerCase().equals(Font.DIALOG.toLowerCase()))) {
+                                        if (EcosystemManager.getFontManager().getActualFont(font).getFamilyName().toLowerCase().equals(familyName.toLowerCase())) {
                                                 fontFound = true;
                                         }
                                 }
 
-                                if (font.getFamily().toLowerCase().equals(Font.DIALOG.toLowerCase())) {
-                                        font = new Font("Times New Roman", Font.PLAIN, 12);
+                                if (!fontFound) {
+                                        font = new Font("Times New Roman");
+                                        font.setStyle(Font.Style.PLAIN);
+                                        font.setSize(12);
                                 }
 
@@ -1464 +1474 @@
          * @param anchorLeft
          */
-        private static void addButton(String text, String link, String action, int width, Frame toAddTo, Float anchorTop, Float anchorRight, Float anchorBottom, Float anchorLeft) {
+        private static void addButton(String text, String link, String action, int width, Frame toAddTo, Integer anchorTop, Integer anchorRight, Integer anchorBottom, Integer anchorLeft) {
                 // Button to go to the next frame/page
                 Text button = new Text(text);
@@ -1470 +1480 @@
                 button.setLink(link);
                 button.addAction(action);
-                button.setBorderColor(new Color(0.7f, 0.7f, 0.7f));
-                button.setBackgroundColor(new Color(0.9f, 0.9f, 0.9f));
+                button.setBorderColor(new Colour(0.7f, 0.7f, 0.7f));
+                button.setBackgroundColor(new Colour(0.9f, 0.9f, 0.9f));
                 button.setThickness(1);
                 button.setLinkMark(false);
@@ -1499 +1509 @@
 
         }
-
-
-        private static class MutableBool {
-                private boolean value;
-
-                public MutableBool(boolean value) {
-                        this.value = value;
-                }
-
-                public boolean getValue() {
-                        return value;
-                }
-
-                public void setValue(boolean value) {
-                        this.value = value;
-                }
-        }
-
-        private static class MutableInt {
-                private int value;
-
-                public MutableInt(int value) {
-                        this.value = value;
-                }
-
-                public int getValue() {
-                        return value;
-                }
-
-                public void setValue(int value) {
-                        this.value = value;
-                }
-        }
 }