Changeset 10307 for trunk/gsdl3/src/java/org/greenstone/anttasks/MyGetUserAndPassword.java

Timestamp:

2005-07-26T11:56:46+12:00 (19 years ago)

Author:

kjdon

Message:

made the username property optional

File:

• trunk/gsdl3/src/java/org/greenstone/anttasks/MyGetUserAndPassword.java (modified) (4 diffs)

trunk/gsdl3/src/java/org/greenstone/anttasks/MyGetUserAndPassword.java

@@ -30 +30 @@
  *  <getuserandpassword 
  *       message="a message to display at the top of the dialog" 
- *       userproperty="the name of the username property to set" 
+ *       userproperty="the name of the username property to set (optional)" 
  *       pwordproperty="the name of the password property to set" 
  *       username="default value for username (optional)" 
@@ -90 +90 @@
         return;
     }
-    if (user_property == null || pword_property == null) {
-        throw new org.apache.tools.ant.BuildException("userproperty and pwordproperty attributes must be specified");
+    if (pword_property == null) {
+        throw new org.apache.tools.ant.BuildException("pwordproperty attribute must be specified");
     }
     
@@ -133 +133 @@
         name_field.setText(username);
     }
+    if (user_property == null ) {
+        name_field.setEditable(false);
+    }
     JLabel pass_label = new JLabel("Password:");
     pass_field = new JPasswordField(16);
@@ -184 +187 @@
     }
     
-    getProject().setProperty(user_property, username);
+    if (user_property != null) {
+        getProject().setProperty(user_property, username);
+    }
     getProject().setProperty(pword_property, password);