diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java
index f784cf2a8..fa92679bc 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
+ * Copyright 2002-20046 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -358,5 +358,3 @@ public class StarTeamCheckin extends TreeBasedTask {
}
}
-
-
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java
index 54d4fe36e..0caf635f9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java
@@ -42,7 +42,7 @@ import org.apache.tools.ant.Project;
*
*
* @version 1.1
- * @see StarBase Web Site
+ * @see borland StarTeam Web Site
*
* @ant.task name="stcheckout" category="scm"
*/
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java
index 80a9518c2..d82360993 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
+ * Copyright 2001-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ import org.apache.tools.ant.BuildException;
* starteamurl="server:port/project/view"/>
*
*
- * @see StarBase Web Site
+ * @see borland StarTeam Web Site
*
* @ant.task name="stlabel" category="scm"
*/
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.java
index 3d9f38681..47c6eaf38 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
+ * Copyright 2001-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -359,15 +359,3 @@ public abstract class StarTeamTask extends Task {
}
}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java
index d9a1b65c2..aaf748983 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java
@@ -46,7 +46,7 @@ import org.apache.tools.ant.Project;
*
* Created: Sat Dec 15 16:55:19 2001
*
- * @see StarBase Web Site
+ * @see borland StarTeam Web Site
*/
public abstract class TreeBasedTask extends StarTeamTask {
@@ -57,7 +57,7 @@ public abstract class TreeBasedTask extends StarTeamTask {
///////////////////////////////////////////////////////////////
/**
* This constant sets the filter to include all files. This default has
- * the same result as setIncludes("*").
+ * the same result as setIncludes("*").
*
* @see #getIncludes()
* @see #setIncludes(String includes)
@@ -67,7 +67,7 @@ public abstract class TreeBasedTask extends StarTeamTask {
/**
* This disables the exclude filter by default. In other words, no files
* are excluded. This setting is equivalent to
- * setExcludes(null).
+ * setExcludes(null).
*
* @see #getExcludes()
* @see #setExcludes(String excludes)
@@ -218,7 +218,7 @@ public abstract class TreeBasedTask extends StarTeamTask {
* if excludes have been specified, emit the list to the log
*/
protected void logIncludes() {
- if (this.DEFAULT_INCLUDESETTING != this.includes) {
+ if (DEFAULT_INCLUDESETTING != this.includes) {
log(" Includes specified: " + this.includes);
}
}
@@ -226,29 +226,29 @@ public abstract class TreeBasedTask extends StarTeamTask {
/**
* Declare files to exclude using standard excludes patterns; optional.
* When filtering files, AntStarTeamCheckOut
- * uses an unmodified version of DirectoryScanner's
- * match method, so here are the patterns straight from the
+ * uses an unmodified version of DirectoryScanner's
+ * match method, so here are the patterns straight from the
* Ant source code:
- *
+ *
* Matches a string against a pattern. The pattern contains two special
* characters:
- *
'*' which means zero or more characters,
- *
'?' which means one and only one character.
- *
+ *
'*' which means zero or more characters,
+ *
'?' which means one and only one character.
+ *
* For example, if you want to check out all files except .XML and
* .HTML files, you would put the following line in your program:
- * setExcludes("*.XML,*.HTML");
- * Finally, note that filters have no effect on the directories
+ * setExcludes("*.XML,*.HTML");
+ * Finally, note that filters have no effect on the directories
* that are scanned; you could not skip over all files in directories
* whose names begin with "project," for instance.
- *
+ *
* Treatment of overlapping inlcudes and excludes: To give a simplistic
* example suppose that you set your include filter to "*.htm *.html"
* and your exclude filter to "index.*". What happens to index.html?
* AntStarTeamCheckOut will not check out index.html, as it matches an
* exclude filter ("index.*"), even though it matches the include
* filter, as well.
- *
+ *
* Please also read the following sections before using filters:
*
* @param excludes A string of filter patterns to exclude. Separate the
@@ -279,7 +279,7 @@ public abstract class TreeBasedTask extends StarTeamTask {
* if excludes have been specified, emit the list to the log
*/
protected void logExcludes() {
- if (this.DEFAULT_EXCLUDESETTING != this.excludes) {
+ if (DEFAULT_EXCLUDESETTING != this.excludes) {
log(" Excludes specified: " + this.excludes);
}
}
@@ -340,8 +340,6 @@ public abstract class TreeBasedTask extends StarTeamTask {
return this.asOfDate;
}
-
-
/**
* If an asofDate parameter has been supplied by the user return a
* StarTeam view based on the configuration of the StarTeam view
@@ -390,8 +388,6 @@ public abstract class TreeBasedTask extends StarTeamTask {
new OLEDate(asOfDate)));
}
-
-
/**
* return the label passed to the task by the user as a string
*
@@ -465,6 +461,7 @@ public abstract class TreeBasedTask extends StarTeamTask {
protected boolean isUsingViewLabel() {
return null != this.labelInUse && this.labelInUse.isViewLabel();
}
+
/**
* returns true if a label has been specified and it is a revision label.
*
@@ -504,10 +501,6 @@ public abstract class TreeBasedTask extends StarTeamTask {
}
}
-
-
-
-
///////////////////////////////////////////////////////////////
// INCLUDE-EXCLUDE processing
///////////////////////////////////////////////////////////////
@@ -750,9 +743,6 @@ public abstract class TreeBasedTask extends StarTeamTask {
java.io.File rootLocalFolder)
throws BuildException;
-
-
-
/**
* Derived classes must override this method to define tests for
* any preconditons required by the task. This method is called at
@@ -765,7 +755,6 @@ public abstract class TreeBasedTask extends StarTeamTask {
*/
protected abstract void testPreconditions() throws BuildException;
-
/**
* Return the full repository path name of a file. Surprisingly there's
* no method in com.starbase.starteam.File to provide this.
@@ -871,6 +860,3 @@ public abstract class TreeBasedTask extends StarTeamTask {
}
}
-
-
-