[utilities COMMIT] in /ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant: input/package-info.java pki/p...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Aug  5 20:50:35 2014
New Revision: 652

URL: http://svn.shibboleth.net/view/utilities?rev=652&view=rev
Log:
Fix some warnings.

Added:
    ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/input/package-info.java   (with props)
    ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/pki/package-info.java   (with props)
    ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/util/package-info.java   (with props)
Modified:
    ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/util/PathToUrl.java
    ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/util/RegexSplit.java
    ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/util/StringFromFile.java

Modified: ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/util/PathToUrl.java
URL: http://svn.shibboleth.net/view/utilities/ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/util/PathToUrl.java?rev=652&r1=651&r2=652&view=diff
==============================================================================
--- ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/util/PathToUrl.java (original)
+++ ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/util/PathToUrl.java Tue Aug  5 20:50:35 2014
@@ -30,7 +30,7 @@
  * <ul>
  * <li><strong>path</strong> - the path that will be converted in to a URL</li>
  * <li><strong>addProperty</strong> - name of the property that will receive the file contents as a string</li>
- * <ul>
+ * </ul>
  */
 public class PathToUrl extends Task {
 

Modified: ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/util/RegexSplit.java
URL: http://svn.shibboleth.net/view/utilities/ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/util/RegexSplit.java?rev=652&r1=651&r2=652&view=diff
==============================================================================
--- ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/util/RegexSplit.java (original)
+++ ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/util/RegexSplit.java Tue Aug  5 20:50:35 2014
@@ -30,7 +30,7 @@
  * <li><strong>input</strong> - the value to be split by the regular expression</li>
  * <li><strong>regex</strong> - regular expression, with one matching group, use to split the string</li>
  * <li><strong>addProperty</strong> - name of the property that will receive the split string</li>
- * <ul>
+ * </ul>
  */
 public class RegexSplit extends Task {
 
@@ -54,27 +54,27 @@
     /**
      * Sets the input string to be split.
      * 
-     * @param input input string to be split
+     * @param s input string to be split
      */
-    public void setInput(String input) {
-        this.input = input.trim();
+    public void setInput(String s) {
+        input = s.trim();
     }
 
     /**
      * Sets the regular expression used to split the input string.
      * 
-     * @param regex regular expression used to split the input string
+     * @param exp regular expression used to split the input string
      */
-    public void setRegex(String regex) {
-        this.regex = regex;
+    public void setRegex(String exp) {
+        regex = exp;
     }
 
     /**
      * Sets the name of the property that will receive the split string.
      * 
-     * @param addProperty name of the property that will receive the split string
+     * @param prop name of the property that will receive the split string
      */
-    public void setAddProperty(String addProperty) {
-        this.addProperty = addProperty;
+    public void setAddProperty(String prop) {
+        addProperty = prop;
     }
 }

Modified: ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/util/StringFromFile.java
URL: http://svn.shibboleth.net/view/utilities/ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/util/StringFromFile.java?rev=652&r1=651&r2=652&view=diff
==============================================================================
--- ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/util/StringFromFile.java (original)
+++ ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/util/StringFromFile.java Tue Aug  5 20:50:35 2014
@@ -32,7 +32,7 @@
  * <ul>
  * <li><strong>input</strong> - the path to the input file</li>
  * <li><strong>addProperty</strong> - name of the property that will receive the file contents as a string</li>
- * <ul>
+ * </ul>
  */
 public class StringFromFile extends Task {
 
@@ -43,7 +43,8 @@
     private String addProperty;
 
     /** {@inheritDoc} */
-    public void execute() throws BuildException {
+    @Override
+    public void execute() {
         try {
             StringBuilder fileData = new StringBuilder(1000);
             BufferedReader reader = new BufferedReader(new FileReader(input));
@@ -62,18 +63,18 @@
     /**
      * Sets the file from which the data will be read.
      * 
-     * @param input file from which the data will be read
+     * @param f file from which the data will be read
      */
-    public void setInput(File input) {

[... 18 lines stripped ...]