javafx is overkill and trickier than necessary, old school method much easier/cleaner

benfry · benfry · commit 2c977366381e · 2015-06-27T15:07:35.000-04:00
diff --git a/app/src/processing/app/ui/Welcome.java b/app/src/processing/app/ui/Welcome.java
@@ -21,6 +21,75 @@
 
 package processing.app.ui;
 
+import java.awt.EventQueue;
+import java.io.File;
+
+import javax.swing.*;
+import javax.swing.event.*;
+import javax.swing.text.html.*;
+
+import processing.app.Base;
+import processing.core.PApplet;
+import processing.data.StringDict;
+
+
+public class Welcome {
+
+  static public void main(String[] args) {
+    Base.initPlatform();
+
+    //File indexFile = Base.getLibFile("welcome/index.html");
+    final File indexFile = new File("../build/shared/lib/welcome/index.html");
+
+    EventQueue.invokeLater(new Runnable() {
+      public void run() {
+        JFrame frame = new JFrame("Welcome to Processing 3");
+        frame.setSize(500, 400);
+        frame.setLocationRelativeTo(null);
+
+        frame.setVisible(true);
+        frame.setDefaultCloseOperation(javax.swing.JFrame.EXIT_ON_CLOSE);
+
+        JTextPane textPane = new JTextPane();
+        textPane.setContentType("text/html");
+        textPane.setEditable(false);
+        String[] lines = PApplet.loadStrings(indexFile);
+        textPane.setText(PApplet.join(lines, "\n"));
+
+        //frame.getContentPane().setLayout(new BoxLayout(frame.getContentPane(), BoxLayout.Y_AXIS));
+        frame.getContentPane().add(textPane);
+
+        HTMLEditorKit kit = (HTMLEditorKit) textPane.getEditorKit();
+        kit.setAutoFormSubmission(false);
+        textPane.addHyperlinkListener(new HyperlinkListener() {
+
+          @Override
+          public void hyperlinkUpdate(HyperlinkEvent e) {
+            //System.out.println(e);
+            if (e instanceof FormSubmitEvent) {
+              //System.out.println("got submit event");
+              String result = ((FormSubmitEvent) e).getData();
+              StringDict dict = new StringDict();
+              String[] pairs = result.split("&");
+              for (String pair : pairs) {
+                String[] pieces = pair.split("=");
+                String attr = PApplet.urlDecode(pieces[0]);
+                String valu = PApplet.urlDecode(pieces[1]);
+                dict.set(attr, valu);
+              }
+              dict.print();
+            } else if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
+              //System.out.println("clicked " + e.getURL());
+              Base.openURL(e.getURL().toExternalForm());
+            }
+          }
+        });
+      }
+    });
+  }
+}
+
+/*
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
@@ -279,3 +348,4 @@ public void run() {
     });
   }
 }
+*/
diff --git a/build/shared/lib/welcome/index.html b/build/shared/lib/welcome/index.html
@@ -1,6 +1,7 @@
 <html>
-  <body> 
-    <form>
+  <body>
+    <!-- action needs to exist (even though blank), otherwise causes NPE -->
+    <form action="">
       <p>
         <a href="https://github.com/processing/processing/wiki/Changes-in-3.0">Read about what&rsquo;s new in 3.0</a> &rarr;
       </p>
@@ -14,7 +15,7 @@
           Since older sketches may not be compatible, we recommend creating a new sketchbook folder, so Processing 2 and 3 can happily coexist. This is a one-time process. <a href="https://github.com/processing/processing/wiki/Multiple-Sketchbooks">Read more about it.</a>
         </p>
 
-        <input type="radio" name="sketchbook" value="create_new" /> 
+        <input type="radio" name="sketchbook" value="create_new" checked /> 
         Create a new sketchbook folder for use with Processing 3 sketches <i>(recommended!)</i>
         <br/>
         <input type="radio" name="sketchbook" value="use_existing" />
@@ -25,7 +26,7 @@
       <input type="checkbox" name="show_each_time" checked />
       Show this welcome message each time
       <br/>
-      <input type="button" value="Get Started" />
+      <input type="submit" value="Get Started" />
     </form>
   </body>
 </html>
