Author: peterreilly
Date: Sun Nov 5 14:51:37 2006
New Revision: 471555
URL: http://svn.apache.org/viewvc?view=rev&rev=471555
Log:
checkstyle
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/CommandlineJava.java
ant/core/trunk/src/main/org/apache/tools/ant/types/DataType.java
ant/core/trunk/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java
ant/core/trunk/src/main/org/apache/tools/ant/types/Path.java
ant/core/trunk/src/main/org/apache/tools/ant/types/Quantifier.java
ant/core/trunk/src/main/org/apache/tools/ant/types/Reference.java
ant/core/trunk/src/main/org/apache/tools/ant/types/Resource.java
ant/core/trunk/src/main/org/apache/tools/ant/types/optional/AbstractScriptComponent.java
ant/core/trunk/src/main/org/apache/tools/ant/types/optional/ScriptMapper.java
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/FileResource.java
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/PropertyResource.java
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/StringResource.java
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/TarResource.java
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
ant/core/trunk/src/main/org/apache/tools/ant/types/spi/Provider.java
ant/core/trunk/src/main/org/apache/tools/ant/types/spi/Service.java
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/CommandlineJava.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/CommandlineJava.java?view=diff&rev=471555&r1=471554&r2=471555
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/types/CommandlineJava.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/CommandlineJava.java Sun
Nov 5 14:51:37 2006
@@ -201,7 +201,7 @@
public void addSysproperties(SysProperties ps) {
variables.addAll(ps.variables);
propertySets.addAll(ps.propertySets);
- }
+ }
/**
* Merge all property sets into a single Properties object.
@@ -509,8 +509,8 @@
* operation, as it has to evaluate the size of many components.
* @return the total number of arguments in the java command line.
* @see #getCommandline()
- * @deprecated since 1.7.
- * Please dont use this, it effectively creates the
+ * @deprecated since 1.7.
+ * Please dont use this, it effectively creates the
* entire command.
*/
public int size() {
Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/DataType.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/DataType.java?view=diff&rev=471555&r1=471554&r2=471555
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/types/DataType.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/DataType.java Sun Nov 5
14:51:37 2006
@@ -52,7 +52,7 @@
/**
* Value to the refid attribute.
*
- * @deprecated since 1.7.
+ * @deprecated since 1.7.
* The user should not be directly referencing
* variable. Please use [EMAIL PROTECTED] #getRefid} instead.
*/
@@ -66,9 +66,9 @@
* child element has been added that is a subclass of
* DataType).</p>
*
- * @deprecated since 1.7.
+ * @deprecated since 1.7.
* The user should not be directly referencing
- * variable. Please use [EMAIL PROTECTED] #setChecked} or
+ * variable. Please use [EMAIL PROTECTED] #setChecked} or
* [EMAIL PROTECTED] #isChecked} instead.
*/
protected boolean checked = true;
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java?view=diff&rev=471555&r1=471554&r2=471555
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java
Sun Nov 5 14:51:37 2006
@@ -54,7 +54,7 @@
}
/**
- * Factory method for instantiating EAs via API in a more
+ * Factory method for instantiating EAs via API in a more
* developer friendly way.
* @param clazz Class, extending EA, which to instantiate
* @param value The value to set on that EA
@@ -65,14 +65,14 @@
* http://issues.apache.org/bugzilla/show_bug.cgi?id=14831</a>
*/
public static EnumeratedAttribute getInstance(
- Class/*<? extends EnumeratedAttribute>*/ clazz,
+ Class/*<? extends EnumeratedAttribute>*/ clazz,
String value) throws BuildException {
if (!EnumeratedAttribute.class.isAssignableFrom(clazz)) {
throw new BuildException("You have to provide a subclass from
EnumeratedAttribut as clazz-parameter.");
}
EnumeratedAttribute ea = null;
try {
- ea = (EnumeratedAttribute)clazz.newInstance();
+ ea = (EnumeratedAttribute) clazz.newInstance();
} catch (Exception e) {
throw new BuildException(e);
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/Path.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/Path.java?view=diff&rev=471555&r1=471554&r2=471555
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/types/Path.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/Path.java Sun Nov 5
14:51:37 2006
@@ -112,7 +112,7 @@
public Iterator iterator() {
return new FileResourceIterator(null, parts);
}
-
+
public boolean isFilesystemOnly() {
return true;
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/Quantifier.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/Quantifier.java?view=diff&rev=471555&r1=471554&r2=471555
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/types/Quantifier.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/Quantifier.java Sun Nov
5 14:51:37 2006
@@ -55,7 +55,7 @@
};
private static final Predicate ANY_PRED = new Predicate() {
- boolean eval(int t, int f) { return t > 0 ; }
+ boolean eval(int t, int f) { return t > 0; }
};
private static final Predicate ONE_PRED = new Predicate() {
Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/Reference.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/Reference.java?view=diff&rev=471555&r1=471554&r2=471555
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/types/Reference.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/Reference.java Sun Nov
5 14:51:37 2006
@@ -32,7 +32,7 @@
/**
* Create a reference.
- * @deprecated since 1.7.
+ * @deprecated since 1.7.
* Please use [EMAIL PROTECTED]
Reference#Reference(Project,String)}
* instead.
*/
@@ -42,7 +42,7 @@
/**
* Create a reference to a named ID.
* @param id the name of this reference
- * @deprecated since 1.7.
+ * @deprecated since 1.7.
* Please use [EMAIL PROTECTED]
Reference#Reference(Project,String)}
* instead.
*/
Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/Resource.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/Resource.java?view=diff&rev=471555&r1=471554&r2=471555
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/types/Resource.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/Resource.java Sun Nov 5
14:51:37 2006
@@ -255,8 +255,8 @@
return super.clone();
} catch (CloneNotSupportedException e) {
throw new UnsupportedOperationException(
- "CloneNotSupportedException for a Resource caught. "+
- "Derived classes must support cloning.");
+ "CloneNotSupportedException for a Resource caught. "
+ + "Derived classes must support cloning.");
}
}
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/optional/AbstractScriptComponent.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/optional/AbstractScriptComponent.java?view=diff&rev=471555&r1=471554&r2=471555
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/types/optional/AbstractScriptComponent.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/types/optional/AbstractScriptComponent.java
Sun Nov 5 14:51:37 2006
@@ -69,7 +69,7 @@
/**
* Initialize the script runner. Calls this before running the system
- */
+ */
protected void initScriptRunner() {
getRunner().bindToComponent(this);
}
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/optional/ScriptMapper.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/optional/ScriptMapper.java?view=diff&rev=471555&r1=471554&r2=471555
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/types/optional/ScriptMapper.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/types/optional/ScriptMapper.java
Sun Nov 5 14:51:37 2006
@@ -22,7 +22,7 @@
import java.util.ArrayList;
/**
- * Script support at map time.
+ * Script support at map time.
* @since Ant1.7
*/
public class ScriptMapper extends AbstractScriptComponent implements
FileNameMapper {
@@ -54,7 +54,7 @@
* Reset the list of files
*/
public void clear() {
- files=new ArrayList(1);
+ files = new ArrayList(1);
}
/**
@@ -84,10 +84,10 @@
getRunner().addBean("source", sourceFileName);
clear();
executeScript("ant_mapper");
- if(files.size()==0) {
+ if (files.size() == 0) {
return null;
} else {
- return (String[])files.toArray(EMPTY_STRING_ARRAY);
+ return (String[]) files.toArray(EMPTY_STRING_ARRAY);
}
}
}
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/FileResource.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/resources/FileResource.java?view=diff&rev=471555&r1=471554&r2=471555
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/FileResource.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/FileResource.java
Sun Nov 5 14:51:37 2006
@@ -39,7 +39,7 @@
private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
private static final int NULL_FILE
= Resource.getMagicNumber("null file".getBytes());
-
+
private File file;
private File baseDir;
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/PropertyResource.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/resources/PropertyResource.java?view=diff&rev=471555&r1=471554&r2=471555
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/PropertyResource.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/PropertyResource.java
Sun Nov 5 14:51:37 2006
@@ -110,7 +110,7 @@
}
return String.valueOf(getValue());
}
-
+
/**
* Get an InputStream for the Resource.
* @return an InputStream containing this Resource's content.
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/StringResource.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/resources/StringResource.java?view=diff&rev=471555&r1=471554&r2=471555
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/StringResource.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/StringResource.java
Sun Nov 5 14:51:37 2006
@@ -156,9 +156,8 @@
//I can't get my head around this; is encoding treatment needed here?
return
//new oata.util.ReaderInputStream(new InputStreamReader(
- new ByteArrayInputStream(getContent().getBytes())
- //, encoding), encoding)
- ;
+ new ByteArrayInputStream(getContent().getBytes());
+ //, encoding), encoding);
}
/**
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/TarResource.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/resources/TarResource.java?view=diff&rev=471555&r1=471554&r2=471555
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/TarResource.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/TarResource.java
Sun Nov 5 14:51:37 2006
@@ -86,7 +86,7 @@
return i;
}
}
-
+
FileUtils.close(i);
throw new BuildException("no entry " + getName() + " in "
+ getArchive());
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java?view=diff&rev=471555&r1=471554&r2=471555
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java
Sun Nov 5 14:51:37 2006
@@ -72,8 +72,8 @@
* setError() as necessary.</p>
*/
public void verifySettings() {
- if(isReference()) {
- ((BaseSelector)getCheckedRef()).verifySettings();
+ if (isReference()) {
+ ((BaseSelector) getCheckedRef()).verifySettings();
}
}
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java?view=diff&rev=471555&r1=471554&r2=471555
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java
Sun Nov 5 14:51:37 2006
@@ -37,7 +37,7 @@
*
* @since Ant 1.6
*/
-public class ContainsRegexpSelector extends BaseExtendSelector
+public class ContainsRegexpSelector extends BaseExtendSelector
implements ResourceSelector {
private String userProvidedExpression = null;
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java?view=diff&rev=471555&r1=471554&r2=471555
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
Sun Nov 5 14:51:37 2006
@@ -472,7 +472,7 @@
}
return true;
}
-
+
/**
* Breaks a path up into a Vector of path elements, tokenizing on
* <code>File.separator</code>.
Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/spi/Provider.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/spi/Provider.java?view=diff&rev=471555&r1=471554&r2=471555
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/types/spi/Provider.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/spi/Provider.java Sun
Nov 5 14:51:37 2006
@@ -34,7 +34,7 @@
/**
* @return the class name for
*/
- public String getClassName(){
+ public String getClassName() {
return type;
}
@@ -42,7 +42,7 @@
* Set the provider classname.
* @param type the value to set.
*/
- public void setClassName(String type){
+ public void setClassName(String type) {
this.type = type;
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/spi/Service.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/spi/Service.java?view=diff&rev=471555&r1=471554&r2=471555
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/types/spi/Service.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/spi/Service.java Sun Nov
5 14:51:37 2006
@@ -32,7 +32,7 @@
/**
* ANT Jar-Task SPI extension
- *
+ *
* @see <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=31520";>
* http://issues.apache.org/bugzilla/show_bug.cgi?id=31520</a>
*/
@@ -62,7 +62,7 @@
/**
* @return the service type.
*/
- public String getType(){
+ public String getType() {
return type;
}
@@ -72,7 +72,7 @@
* an interface or a class (normally
* abstract).
*/
- public void setType(String type){
+ public void setType(String type) {
this.type = type;
}
@@ -87,11 +87,11 @@
Writer writer;
Iterator providerIterator;
Provider provider;
-
+
arrayOut = new ByteArrayOutputStream();
writer = new OutputStreamWriter(arrayOut, "UTF-8");
providerIterator = providerList.iterator();
- while (providerIterator.hasNext()){
+ while (providerIterator.hasNext()) {
provider = (Provider) providerIterator.next();
writer.write(provider.getClassName());
writer.write("\n");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
