GetPropertyAction.java (setParameters): Renamed from 'setName'.

2004-07-28  Bryce McKinlay  <mckinlay@redhat.com>

	* gnu/java/security/action/GetPropertyAction.java (setParameters):
	Renamed from 'setName'. New 2-argument form with default value.
	(run): Pass default 'value' parameter to System.getProperty().
	* gnu/java/security/action/SetAccessibleAction.java: Fix javadoc
	typos.
	* gnu/java/net/protocol/http/Connection.java: Use 'setParameters'
	not 'setName'.

From-SVN: r85274

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e4de1d006ff5573fe42b52c63d2cc81df646da10..a1df38a429ba16378429361c2b37e5390f615a71 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,13 @@
+2004-07-28  Bryce McKinlay  <mckinlay@redhat.com>
+
+       * gnu/java/security/action/GetPropertyAction.java (setParameters):
+       Renamed from 'setName'. New 2-argument form with default value.
+       (run): Pass default 'value' parameter to System.getProperty().
+       * gnu/java/security/action/SetAccessibleAction.java: Fix javadoc
+       typos.
+       * gnu/java/net/protocol/http/Connection.java: Use 'setParameters'
+       not 'setName'.
+
 2004-07-28  Bryce McKinlay  <mckinlay@redhat.com>
 
        * configure.in: Check for minimum GTK version 2.4 requirement.

diff --git a/libjava/gnu/java/net/protocol/http/Connection.java b/libjava/gnu/java/net/protocol/http/Connection.java
index ccae499dc33dc3997cc2fcc4502cac292cf4a4fc..e15fda862507bbf36ebe4584d43bac97426b99ab 100644 (file)
--- a/libjava/gnu/java/net/protocol/http/Connection.java
+++ b/libjava/gnu/java/net/protocol/http/Connection.java
@@ -97,7 +97,7 @@ public final class Connection extends HttpURLConnection
     if (proxyHost != null)
       {
        proxyInUse = true;
-       getProperty.setName("http.proxyPort");
+       getProperty.setParameters("http.proxyPort");
        port = (String) AccessController.doPrivileged(getProperty);
        if (port != null)
          {
@@ -112,7 +112,7 @@ public final class Connection extends HttpURLConnection
          }
       }
 
-    getProperty.setName("http.agent");
+    getProperty.setParameters("http.agent");
     userAgent = (String) AccessController.doPrivileged(getProperty);
   }
 

diff --git a/libjava/gnu/java/security/action/GetPropertyAction.java b/libjava/gnu/java/security/action/GetPropertyAction.java
index f40f479bae7f76614be5952b06d2d62fcc7a718f..3657254d008238ab8dca4412556f5ba2c2fc737a 100644 (file)
--- a/libjava/gnu/java/security/action/GetPropertyAction.java
+++ b/libjava/gnu/java/security/action/GetPropertyAction.java
@@ -51,7 +51,8 @@ import java.security.PrivilegedAction;
  */
 public class GetPropertyAction implements PrivilegedAction
 {
-  String propName;
+  String name;
+  String value = null;
 
   public GetPropertyAction()
   {
@@ -59,17 +60,30 @@ public class GetPropertyAction implements PrivilegedAction
   
   public GetPropertyAction(String propName)
   {
-    this.propName = propName;
+    setParameters(propName);
+  }
+
+  public GetPropertyAction(String propName, String defaultValue)
+  {
+    setParameters(propName, defaultValue);
   }
   
   public Object run()
   {
-    return System.getProperty(propName);
+    return System.getProperty(name, value);
   }
   
-  public GetPropertyAction setName(String propName)
+  public GetPropertyAction setParameters(String propName)
+  {
+    this.name = propName;
+    this.value = null;
+    return this;
+  }
+
+  public GetPropertyAction setParameters(String propName, String defaultValue)
   {
-    this.propName = propName;
+    this.name = propName;
+    this.value = defaultValue;
     return this;
   }
 }

diff --git a/libjava/gnu/java/security/action/SetAccessibleAction.java b/libjava/gnu/java/security/action/SetAccessibleAction.java
index 810681fd84cea692d5ea5afd3ab430e4889658b2..2827a3a6f759d7e97d17913dcd7e7812b1a7f405 100644 (file)
--- a/libjava/gnu/java/security/action/SetAccessibleAction.java
+++ b/libjava/gnu/java/security/action/SetAccessibleAction.java
@@ -41,13 +41,13 @@ import java.lang.reflect.AccessibleObject;
 import java.security.PrivilegedAction;
 
 /**
- * PrivilagedAction implementation that calls setAccessible(true) on the 
+ * PrivilegedAction implementation that calls setAccessible(true) on the 
  * AccessibleObject passed to its constructor.
  *
  * Example of use:
  * <code>
  * Field dataField = cl.getDeclaredField("data");
- * AccessController.doPrivilaged(new SetAccessibleAction(dataField));
+ * AccessController.doPrivileged(new SetAccessibleAction(dataField));
  * </code>
  */
 public class SetAccessibleAction implements PrivilegedAction