Changeset 883

Timestamp:

02/12/14 17:19:30 (10 years ago)

Author:

ngw8

Message:

Bug fixes with webparser: pages with no titles no longer throw an exception and CSS 'sans-serif' is now converted to Java's 'SansSerif', rather than trying to use Arial Unicode, which isn't always available.
Dropping 'convert' on a jfxbrowser now uses the new method of conversion.

Location:

trunk/src/org/expeditee

Files:

• io/WebParser.java (modified) (2 diffs)
• items/widgets/JfxBrowser.java (modified) (1 diff)

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

@@ -302 +302 @@
                         final MutableInt horizontalCount = new MutableInt(0);
 
-                        final String pageTitle = webEngine.getTitle();
+                        final String pageTitle;
+                        
+                        if (webEngine.getTitle() != null) {
+                                pageTitle = webEngine.getTitle();
+                        } else {
+                                pageTitle = "Untitled Page";
+                        }
 
                         final Progress progressBar = MessageBay.displayProgress("Converting web page");
@@ -1254 +1260 @@
                                 for (int j = 0; j < typefaces.length && !fontFound; j++) {
                                         if (typefaces[j].toLowerCase().equals("sans-serif")) {
-                                                typefaces[j] = "Arial Unicode MS";
-                                        } else if (typefaces[j].toLowerCase().equals("serif")) {
-                                                typefaces[j] = "Times New Roman";
+                                                typefaces[j] = "SansSerif";
                                         } else if ((typefaces[j].toLowerCase().equals("arial"))) {
                                                 // Have to use Arial Unicode, otherwise unicode characters display incorrectly
+                                                // It seems that not all systems have this font (including some Windows machines), 
+                                                // but as long as the website has a general font type specified (e.g. "font-family: Arial, Sans-Serif"),
+                                                // there should be no noticeable difference.
                                                 typefaces[j] = "Arial Unicode MS";
+                                        } else if ((typefaces[j].toLowerCase().equals("monospace"))) {
+                                                typefaces[j] = "monospaced";
                                         }
 

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

@@ -704 +704 @@
         public void getFrame() {
                 try {
-                        WebParser.parsePage(this._webEngine, DisplayIO.getCurrentFrame());
+                        WebParser.parsePageSimple(this, _webEngine, _webView, DisplayIO.getCurrentFrame());
                 } catch (Exception e) {
                         e.printStackTrace();