Changeset 6659

Timestamp:

2004-01-29T14:40:35+13:00 (20 years ago)

Author:

jmt12

Message:

Due to popular demand, the URLField now has basic validation again. This means it prevent some perfectly good URLs, but only when mirrorings, my precious.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/URLField.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/URLField.java

@@ -6 +6 @@
 import javax.swing.event.*;
 import javax.swing.text.*;
+import org.greenstone.gatherer.Gatherer;
 
 public class URLField
@@ -11 +12 @@
     implements DocumentListener {
 
-    static final public Pattern URL_PATTERN = Pattern.compile("(h|ht|htt|http|http:|http:/|http://|http://)?(([a-zA-Z]([a-zA-Z]|[0-9]|[\\$\\-_\\&\\+]|[!\\*\"\'\\(\\)]|(%[0-9A-Fa-f][0-9A-Fa-f]))*(\\.[a-zA-Z]([a-zA-Z]|[0-9]|[\\$\\-_\\&\\+]|[!\\*\"\'\\(\\)]|(%[0-9A-Fa-f][0-9A-Fa-f]))*)*)|(([0-9])+\\.([0-9])+\\.([0-9])+\\.([0-9])+))(:([0-9])+)?(/([a-zA-Z]|[0-9]|[\\$\\-_\\.\\&\\+]|[!\\*\"\'\\(\\),]|(%[0-9A-Fa-f][0-9A-Fa-f]))*)*");
+    static final public Pattern URL_PATTERN = Pattern.compile("(h|ht|htt|http|http:|http:/|http://|http://)(([a-zA-Z]([a-zA-Z]|[0-9]|[\\$\\-_\\&\\+]|[!\\*\"\'\\(\\)]|(%[0-9A-Fa-f][0-9A-Fa-f]))*(\\.[a-zA-Z]([a-zA-Z]|[0-9]|[\\$\\-_\\&\\+]|[!\\*\"\'\\(\\)]|(%[0-9A-Fa-f][0-9A-Fa-f]))*)*)|(([0-9])+\\.([0-9])+\\.([0-9])+\\.([0-9])+))(:([0-9])+)?(/([a-zA-Z]|[0-9]|[\\$\\-_\\.\\&\\+]|[!\\*\"\'\\(\\),]|(%[0-9A-Fa-f][0-9A-Fa-f]))*)*");
 
     // Crap RegEx that matches everything dammit
     //static final public Pattern URL_PATTERN = Pattern.compile("((.*?)://)?(([^:]*):([^@]*)@)?(([^/:]*)(:[^/]*))?([^\\?#]*/?)?(\\?([^?#]*))?(#(.*))?");
 
-    //static final public Pattern URL_PATTERN = Pattern.compile("(h|ht|htt|http|http:|http:/|http://|http://)?[a-zA-Z0-9-]*(\.[a-zA-Z0-9-])*");
-
+    // Crap RegEx that demands URL starts with www
     //static final public Pattern URL_PATTERN = Pattern.compile("(h|ht|htt|http|http:|http:/|http://|http://)?[\\w]+(\\.[\\w]+)([\\w\\-\\.,@?^=%&:/~\\+#]*[\\w\\-\\@?^=%&/~\\+#])?");
 
@@ -72 +72 @@
 
     public boolean validateURL() {
-    return true;
-//      boolean result;
-//      String text = getText();
-//      Matcher m = URL_PATTERN.matcher(text);
-//      if(text.length() == 0 || m.matches()) {
-//          setBackground(background);
-//          setForeground(foreground);
-//          result = true;
-//      }
-//      else {
-//          setBackground(invalid_background);
-//          setForeground(invalid_foreground);
-//          result = false;
-//      }
-//      m = null;
-//      System.err.println("Validating: " + text + " -> " + (result ? "GOOD" : "BAD"));
-//      text = null;
-//      return result;
+    boolean result;
+    String text = getText();
+    Matcher m = URL_PATTERN.matcher(text);
+    if(text.length() == 0 || m.matches()) {
+        setBackground(background);
+        setForeground(foreground);
+        result = true;
+    }
+    else {
+        setBackground(invalid_background);
+        setForeground(invalid_foreground);
+        result = false;
+    }
+    m = null;
+    Gatherer.println("Validating: " + text + " -> " + (result ? "GOOD" : "BAD"));
+    text = null;
+    return result;
     }