You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by pe...@apache.org on 2006/11/18 19:07:46 UTC
svn commit: r476576 - in
/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional: ./ scm/
script/ sos/ sound/ starteam/ unix/
Author: peterreilly
Date: Sat Nov 18 10:07:45 2006
New Revision: 476576
URL: http://svn.apache.org/viewvc?view=rev&rev=476576
Log:
checkstyle
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java?view=diff&rev=476576&r1=476575&r2=476576
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java Sat Nov 18 10:07:45 2006
@@ -324,6 +324,11 @@
field = unit.getCalendarField();
}
+ /**
+ * Apply the nested element to the properties.
+ * @param props the properties to apply the entry on.
+ * @throws BuildException if there is an error.
+ */
protected void executeOn(Properties props) throws BuildException {
checkParameters();
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java?view=diff&rev=476576&r1=476575&r2=476576
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java Sat Nov 18 10:07:45 2006
@@ -187,7 +187,10 @@
}
}
-
+ /**
+ * Check if the attributes/elements are correct.
+ * @throws BuildException if there was a problem.
+ */
protected void checkParameters() throws BuildException {
// Check all of the properties that are required.
assertTrue(getServerName() != null, "ServerName must be set.");
@@ -220,7 +223,7 @@
/**
* Do the execution.
*
- * @exception BuildException
+ * @throws BuildException if there was a problem.
*/
public void execute() throws BuildException {
log("DEPRECATED - The starteam task is deprecated. Use stcheckout instead.",
@@ -658,7 +661,7 @@
* Formats a property value for display to the user.
*
* @param p An item property to format.
- * @param value
+ * @param value the object to format.
* @return A string containing the property, which is truncated to 35
* characters for display.
*/
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java?view=diff&rev=476576&r1=476575&r2=476576
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java Sat Nov 18 10:07:45 2006
@@ -274,8 +274,7 @@
*/
ClassLoader loader = createLoader();
- try
- {
+ try {
instance = ClasspathUtils.newInstance(classname, loader);
} catch (BuildException e) {
instance = ClasspathUtils.newInstance(classname, ScriptDef.class.getClassLoader());
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java?view=diff&rev=476576&r1=476575&r2=476576
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java Sat Nov 18 10:07:45 2006
@@ -54,8 +54,10 @@
private boolean recursive = false;
private boolean verbose = false;
+ // CheckStyle:VisibilityModifier OFF - bc
/** Commandline to be executed. */
protected Commandline commandLine;
+ // CheckStyle:VisibilityModifier ON
/**
* Flag to disable the cache when set.
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java?view=diff&rev=476576&r1=476575&r2=476576
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java Sat Nov 18 10:07:45 2006
@@ -183,7 +183,7 @@
/**
* Fired after the last target has finished. This event
* will still be thrown if an error occurred during the build.
- *
+ * @param event the build finished event.
* @see BuildEvent#getException()
*/
public void buildFinished(BuildEvent event) {
@@ -197,7 +197,7 @@
/**
* Fired when a target is started.
- *
+ * @param event ignored.
* @see BuildEvent#getTarget()
*/
public void targetStarted(BuildEvent event) {
@@ -206,7 +206,7 @@
/**
* Fired when a target has finished. This event will
* still be thrown if an error occurred during the build.
- *
+ * @param event ignored.
* @see BuildEvent#getException()
*/
public void targetFinished(BuildEvent event) {
@@ -214,7 +214,7 @@
/**
* Fired when a task is started.
- *
+ * @param event ignored.
* @see BuildEvent#getTask()
*/
public void taskStarted(BuildEvent event) {
@@ -223,7 +223,7 @@
/**
* Fired when a task has finished. This event will still
* be throw if an error occurred during the build.
- *
+ * @param event ignored.
* @see BuildEvent#getException()
*/
public void taskFinished(BuildEvent event) {
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java?view=diff&rev=476576&r1=476575&r2=476576
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java Sat Nov 18 10:07:45 2006
@@ -43,7 +43,8 @@
* </pre>
*
* @version 1.1
- * @see <a href="http://www.borland.com/us/products/starteam/index.html">borland StarTeam Web Site</a>
+ * @see <a href="http://www.borland.com/us/products/starteam/index.html"
+ * >borland StarTeam Web Site</a>
*
* @ant.task name="stcheckout" category="scm"
*/
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java?view=diff&rev=476576&r1=476575&r2=476576
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java Sat Nov 18 10:07:45 2006
@@ -38,7 +38,8 @@
* starteamurl="server:port/project/view"/>
* </pre>
*
- * @see <a href="http://www.borland.com/us/products/starteam/index.html">borland StarTeam Web Site</a>
+ * @see <a href="http://www.borland.com/us/products/starteam/index.html"
+ * >borland StarTeam Web Site</a>
*
* @ant.task name="stlabel" category="scm"
*/
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java?view=diff&rev=476576&r1=476575&r2=476576
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java Sat Nov 18 10:07:45 2006
@@ -47,7 +47,8 @@
*
* Created: Sat Dec 15 16:55:19 2001
*
- * @see <a href="http://www.borland.com/us/products/starteam/index.html">borland StarTeam Web Site</a>
+ * @see <a href="http://www.borland.com/us/products/starteam/index.html"
+ * >borland StarTeam Web Site</a>
*/
public abstract class TreeBasedTask extends StarTeamTask {
@@ -285,6 +286,7 @@
}
}
+ // CheckStyle:MethodNameCheck OFF - bc
/**
* protected function to allow subclasses to set the label (or not).
@@ -328,6 +330,8 @@
this.asOfDateFormat = asOfDateFormat;
}
}
+
+ // CheckStyle:VisibilityModifier ON
/**
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java?view=diff&rev=476576&r1=476575&r2=476576
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java Sat Nov 18 10:07:45 2006
@@ -403,7 +403,8 @@
* <code>File.getCanonicalPath</code>
* fail.
*/
- public static void deleteSymlink(File linkfil) throws IOException {
+ public static void deleteSymlink(File linkfil)
+ throws IOException, FileNotFoundException {
if (!linkfil.exists()) {
throw new FileNotFoundException("No such symlink: " + linkfil);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org