Changeset 10575

Timestamp:

2005-08-28T13:45:40+12:00 (19 years ago)

Author:

mdewsnip

Message:

Made URLField far simpler and more accurate. Removed the crazy regular expressions and now just attempts to create a URL object to validate the string.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (2 diffs)
• gui/URLField.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -696 +696 @@
         dialog = new WarningDialog("warning.MissingEXEC", "MissingEXEC.Title", Dictionary.get("MissingEXEC.Message"), "general.library_url", false);
     }
-    dialog.setValueField(new URLField(Configuration.getColor("coloring.editable_foreground", false), Configuration.getColor("coloring.editable_background", false), Configuration.getColor("coloring.error_foreground", false), Configuration.getColor("coloring.error_background", false)));
+    dialog.setValueField(new URLField(Configuration.getColor("coloring.editable_foreground", false), Configuration.getColor("coloring.editable_background", false)));
     dialog.display();
     dialog.dispose();
@@ -716 +716 @@
     {
     WarningDialog dialog = new WarningDialog("warning.MissingGLIServer", "MissingGLIServer.Title", Dictionary.get("MissingGLIServer.Message"), "general.gliserver_url", false);
-    dialog.setValueField(new URLField(Configuration.getColor("coloring.editable_foreground", false), Configuration.getColor("coloring.editable_background", false), Configuration.getColor("coloring.error_foreground", false), Configuration.getColor("coloring.error_background", false)));
+    dialog.setValueField(new URLField(Configuration.getColor("coloring.editable_foreground", false), Configuration.getColor("coloring.editable_background", false)));
     dialog.display();
     dialog.dispose();

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

@@ -2 +2 @@
 
 import java.awt.*;
-import java.util.regex.*;
+import java.net.*;
 import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.text.*;
-import org.greenstone.gatherer.DebugStream;
 
 
 public class URLField
-    extends JTextField 
-    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]))*)*");
-
-    // Crap RegEx that matches everything dammit
-    //static final public Pattern URL_PATTERN = Pattern.compile("((.*?)://)?(([^:]*):([^@]*)@)?(([^/:]*)(:[^/]*))?([^\\?#]*/?)?(\\?([^?#]*))?(#(.*))?");
-
-    // 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\\-\\@?^=%&/~\\+#])?");
-
-    private Color background;
-    private Color foreground;
-    private Color invalid_background;
-    private Color invalid_foreground;
-
-    public URLField(Color foreground, Color background, Color invalid_foreground, Color invalid_background) {
+    extends JTextField
+{
+    public URLField(Color foreground, Color background)
+    {
     super();
-    this.background = background;
-    this.foreground = foreground;
-    this.invalid_background = invalid_background;
-    this.invalid_foreground = invalid_foreground;
     setBackground(background);
     setForeground(foreground);
-    //getDocument().addDocumentListener(this);
     }
 
-    public URLField(String email, Color foreground, Color background, Color invalid_foreground, Color invalid_background) {
-    super(email);
-    this.background = background;
-    this.foreground = foreground;
-    this.invalid_background = invalid_background;
-    this.invalid_foreground = invalid_foreground;
-    setBackground(background);
-    //getDocument().addDocumentListener(this);
-    }
 
-    /** Gives notification that an attribute or set of attributes changed.
-     * @param e
-     */
-    public void changedUpdate(DocumentEvent e) {
-    validateURL();
-    }
-          
-    /** Gives notification that there was an insert into the document.
-     * @param e
-     */
-    public void insertUpdate(DocumentEvent e) {
-    validateURL();
-    }
+    public boolean validateURL()
+    {
+    String url_string = getText();
+    if (!url_string.equals("")) {
+        // Check the URL string is valid by trying to create a URL object from it
+        try {
+        new URL(url_string);
+        }
+        catch (MalformedURLException exception) {
+        // URL string is invalid
+        return false;
+        }
+    }
 
-    public boolean isEmpty() {
-    return (this.getText().length() == 0);
-    }
-          
-    /** Gives notification that a portion of the document has been removed. 
-     * @param e
-     */
-    public void removeUpdate(DocumentEvent e) {
-    validateURL();
-    }
-
-    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;
-    DebugStream.println("Validating: " + text + " -> " + (result ? "GOOD" : "BAD"));
-    text = null;
-    return result;
+    // URL string is valid
+    return true;
     }
 }