Changeset 536

Timestamp:

11/26/13 14:14:09 (10 years ago)

Author:

jts21

Message:

Tested JfxBrowser with proxy auth (working), fixed some mistakes in proxy auth error messages, also tested JfxBrowser on Java 8 (seems to work perfectly with no changes)

Location:

trunk

Files:

• releases/Expeditee-1.6.jar (modified) ( previous)
• releases/Expeditee.jar (modified) ( previous)
• src/org/expeditee/gui/FrameUtils.java (modified) (4 diffs)
• src/org/expeditee/io/ProxyAuth.java (modified) (1 diff)
• src/org/expeditee/items/widgets/JfxBrowser.java (modified) (1 diff)

trunk/src/org/expeditee/gui/FrameUtils.java

@@ -804 +804 @@
                         }
                 }
+                if(host == null) {
+                        MessageBay.displayMessage("http_host was not defined!", Color.ORANGE);
+                }
+                if(port == null) {
+                        MessageBay.displayMessage("http_port was not defined! (defaulted to 80)", Color.ORANGE);
+                        port = "80";
+                }
+                if(user == null) {
+                        MessageBay.displayMessage("http_user was not defined!", Color.ORANGE);
+                }
+                if(pass == null) {
+                        MessageBay.displayMessage("http_pass was not defined!", Color.ORANGE);
+                }
                 System.setProperty("http.proxyHost", host);
                 System.setProperty("http.proxyPort", port);
@@ -825 +838 @@
                                 if(str.startsWith("http_host:")) {
                                         if(host != null) {
-                                                MessageBay.displayMessage("http_host was defined multiple times!", Color.ORANGE);
+                                                MessageBay.displayMessage("https_host was defined multiple times!", Color.ORANGE);
                                         }
                                         host = str.substring(10).trim();
-                                } else if(str.startsWith("http_port:")) {
+                                } else if(str.startsWith("https_port:")) {
                                         if(port!= null) {
-                                                MessageBay.displayMessage("http_port was defined multiple times!", Color.ORANGE);
+                                                MessageBay.displayMessage("https_port was defined multiple times!", Color.ORANGE);
                                         }
                                         port = str.substring(10).trim();
-                                } else if(str.startsWith("http_user:")) {
+                                } else if(str.startsWith("https_user:")) {
                                         if(user != null) {
-                                                MessageBay.displayMessage("http_user was defined multiple times!", Color.ORANGE);
+                                                MessageBay.displayMessage("https_user was defined multiple times!", Color.ORANGE);
                                         }
                                         user = str.substring(11).trim();
-                                } else if(str.startsWith("http_pass:")) { // unencrypted password
+                                } else if(str.startsWith("https_pass:")) { // unencrypted password
                                         if(pass != null) {
-                                                MessageBay.displayMessage("http_pass was defined multiple times!", Color.ORANGE);
+                                                MessageBay.displayMessage("https_pass was defined multiple times!", Color.ORANGE);
                                         }
                                         pass = str.substring(11).trim();
@@ -850 +863 @@
                                                                 passwordWidget = (Password) InteractiveWidget.createWidget((Text)config);
                                                                 if(pass != null) {
-                                                                        MessageBay.displayMessage("http_pass was defined multiple times!", Color.ORANGE);
+                                                                        MessageBay.displayMessage("https_pass was defined multiple times!", Color.ORANGE);
                                                                 }
                                                                 pass = passwordWidget.getPassword();
@@ -871 +884 @@
                                         }
                                         if(pass != null) {
-                                                MessageBay.displayMessage("http_pass was defined multiple times!", Color.ORANGE);
+                                                MessageBay.displayMessage("https_pass was defined multiple times!", Color.ORANGE);
                                         }
                                         pass = passwordWidget.getPassword();
                                 }
                         }
+                }
+                if(host == null) {
+                        MessageBay.displayMessage("https_host was not defined!", Color.ORANGE);
+                }
+                if(port == null) {
+                        MessageBay.displayMessage("https_port was not defined! (defaulted to 80)", Color.ORANGE);
+                        port = "80";
+                }
+                if(user == null) {
+                        MessageBay.displayMessage("https_user was not defined!", Color.ORANGE);
+                }
+                if(pass == null) {
+                        MessageBay.displayMessage("https_pass was not defined!", Color.ORANGE);
                 }
                 System.setProperty("https.proxyHost", host);

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

@@ -6 +6 @@
 public class ProxyAuth extends Authenticator {
 
-        private String httpUser, httpPass, httpsUser, httpsPass;
+        private String httpUser = null, httpPass = null, httpsUser = null, httpsPass = null;
         
         public ProxyAuth() {

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

@@ -212 +212 @@
 
         public JfxBrowser(Text source, String[] args) {
-                super(source, new WebBrowserPanel("http://waikato.ac.nz"), -1, 500, -1, -1, 300, -1);
+                // Testing proxy auth
+                super(source, new WebBrowserPanel("http://stackoverflow.com"), -1, 500, -1, -1, 300, -1);
 
                 _browser = (WebBrowserPanel) _swingComponent;