Changeset 6631

Timestamp:

2004-01-28T14:38:38+13:00 (20 years ago)

Author:

jmt12

Message:

Due to the lack of a 'perfect' pattern against which valid URLs match, I've decided to disable URL valiadation

File:

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

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

@@ -11 +11 @@
     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
@@ -18 +18 @@
     //static final public Pattern URL_PATTERN = Pattern.compile("(h|ht|htt|http|http:|http:/|http://|http://)?[a-zA-Z0-9-]*(\.[a-zA-Z0-9-])*");
 
-    static final public Pattern URL_PATTERN = Pattern.compile("(h|ht|htt|http|http:|http:/|http://|http://)?[\\w]+(\\.[\\w]+)([\\w\\-\\.,@?^=%&:/~\\+#]*[\\w\\-\\@?^=%&/~\\+#])?");
+    //static final public Pattern URL_PATTERN = Pattern.compile("(h|ht|htt|http|http:|http:/|http://|http://)?[\\w]+(\\.[\\w]+)([\\w\\-\\.,@?^=%&:/~\\+#]*[\\w\\-\\@?^=%&/~\\+#])?");
 
     private Color background;
@@ -72 +72 @@
 
     public boolean validateURL() {
-    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;
-    return result;
+    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;
     }