Browse Source

- trim whitespace

- xhtmlify javadoc

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@411696 13f79535-47bb-0310-9956-ffa450edef68
master
Kevin Jackson 19 years ago
parent
commit
06c1247488
5 changed files with 21 additions and 49 deletions
  1. +1
    -3
      src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java
  2. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java
  3. +2
    -2
      src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java
  4. +1
    -13
      src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.java
  5. +16
    -30
      src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java

+ 1
- 3
src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java View File

@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -358,5 +358,3 @@ public class StarTeamCheckin extends TreeBasedTask {
} }


} }



+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java View File

@@ -42,7 +42,7 @@ import org.apache.tools.ant.Project;
* </pre> * </pre>
* *
* @version 1.1 * @version 1.1
* @see <A HREF="http://www.starbase.com/">StarBase 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" * @ant.task name="stcheckout" category="scm"
*/ */


+ 2
- 2
src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java View File

@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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"/&gt; * starteamurl="server:port/project/view"/&gt;
* </pre> * </pre>
* *
* @see <A HREF="http://www.starbase.com/">StarBase 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" * @ant.task name="stlabel" category="scm"
*/ */


+ 1
- 13
src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.java View File

@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -359,15 +359,3 @@ public abstract class StarTeamTask extends Task {
} }


} }













+ 16
- 30
src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java View File

@@ -46,7 +46,7 @@ import org.apache.tools.ant.Project;
* *
* Created: Sat Dec 15 16:55:19 2001 * Created: Sat Dec 15 16:55:19 2001
* *
* @see <A HREF="http://www.starbase.com/">StarBase 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 { 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 * This constant sets the filter to include all files. This default has
* the same result as <CODE>setIncludes("*")</CODE>.
* the same result as <code>setIncludes("*")</code>.
* *
* @see #getIncludes() * @see #getIncludes()
* @see #setIncludes(String includes) * @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 * This disables the exclude filter by default. In other words, no files
* are excluded. This setting is equivalent to * are excluded. This setting is equivalent to
* <CODE>setExcludes(null)</CODE>.
* <code>setExcludes(null)</code>.
* *
* @see #getExcludes() * @see #getExcludes()
* @see #setExcludes(String excludes) * @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 * if excludes have been specified, emit the list to the log
*/ */
protected void logIncludes() { protected void logIncludes() {
if (this.DEFAULT_INCLUDESETTING != this.includes) {
if (DEFAULT_INCLUDESETTING != this.includes) {
log(" Includes specified: " + this.includes); log(" Includes specified: " + this.includes);
} }
} }
@@ -226,29 +226,29 @@ public abstract class TreeBasedTask extends StarTeamTask {
/** /**
* Declare files to exclude using standard <tt>excludes</tt> patterns; optional. * Declare files to exclude using standard <tt>excludes</tt> patterns; optional.
* When filtering files, AntStarTeamCheckOut * When filtering files, AntStarTeamCheckOut
* uses an unmodified version of <CODE>DirectoryScanner</CODE>'s
* <CODE>match</CODE> method, so here are the patterns straight from the
* uses an unmodified version of <code>DirectoryScanner</code>'s
* <code>match</code> method, so here are the patterns straight from the
* Ant source code: * Ant source code:
* <BR><BR>
* <br/>
* Matches a string against a pattern. The pattern contains two special * Matches a string against a pattern. The pattern contains two special
* characters: * characters:
* <BR>'*' which means zero or more characters,
* <BR>'?' which means one and only one character.
* <BR><BR>
* <br/>'*' which means zero or more characters,
* <br/>'?' which means one and only one character.
* <br/>
* For example, if you want to check out all files except .XML and * For example, if you want to check out all files except .XML and
* .HTML files, you would put the following line in your program: * .HTML files, you would put the following line in your program:
* <CODE>setExcludes("*.XML,*.HTML");</CODE>
* Finally, note that filters have no effect on the <B>directories</B>
* <code>setExcludes("*.XML,*.HTML");</code>
* Finally, note that filters have no effect on the <b>directories</b>
* that are scanned; you could not skip over all files in directories * that are scanned; you could not skip over all files in directories
* whose names begin with "project," for instance. * whose names begin with "project," for instance.
* <BR><BR>
* <br/>
* Treatment of overlapping inlcudes and excludes: To give a simplistic * Treatment of overlapping inlcudes and excludes: To give a simplistic
* example suppose that you set your include filter to "*.htm *.html" * example suppose that you set your include filter to "*.htm *.html"
* and your exclude filter to "index.*". What happens to index.html? * and your exclude filter to "index.*". What happens to index.html?
* AntStarTeamCheckOut will not check out index.html, as it matches an * AntStarTeamCheckOut will not check out index.html, as it matches an
* exclude filter ("index.*"), even though it matches the include * exclude filter ("index.*"), even though it matches the include
* filter, as well. * filter, as well.
* <BR><BR>
* <br/>
* Please also read the following sections before using filters: * Please also read the following sections before using filters:
* *
* @param excludes A string of filter patterns to exclude. Separate the * @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 * if excludes have been specified, emit the list to the log
*/ */
protected void logExcludes() { protected void logExcludes() {
if (this.DEFAULT_EXCLUDESETTING != this.excludes) {
if (DEFAULT_EXCLUDESETTING != this.excludes) {
log(" Excludes specified: " + this.excludes); log(" Excludes specified: " + this.excludes);
} }
} }
@@ -340,8 +340,6 @@ public abstract class TreeBasedTask extends StarTeamTask {
return this.asOfDate; return this.asOfDate;
} }




/** /**
* If an asofDate parameter has been supplied by the user return a * If an asofDate parameter has been supplied by the user return a
* StarTeam view based on the configuration of the StarTeam view * StarTeam view based on the configuration of the StarTeam view
@@ -390,8 +388,6 @@ public abstract class TreeBasedTask extends StarTeamTask {
new OLEDate(asOfDate))); new OLEDate(asOfDate)));
} }




/** /**
* return the label passed to the task by the user as a string * 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() { protected boolean isUsingViewLabel() {
return null != this.labelInUse && this.labelInUse.isViewLabel(); return null != this.labelInUse && this.labelInUse.isViewLabel();
} }
/** /**
* returns true if a label has been specified and it is a revision label. * 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 // INCLUDE-EXCLUDE processing
/////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////
@@ -750,9 +743,6 @@ public abstract class TreeBasedTask extends StarTeamTask {
java.io.File rootLocalFolder) java.io.File rootLocalFolder)
throws BuildException; throws BuildException;





/** /**
* Derived classes must override this method to define tests for * Derived classes must override this method to define tests for
* any preconditons required by the task. This method is called at * 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; protected abstract void testPreconditions() throws BuildException;



/** /**
* Return the full repository path name of a file. Surprisingly there's * Return the full repository path name of a file. Surprisingly there's
* no method in com.starbase.starteam.File to provide this. * no method in com.starbase.starteam.File to provide this.
@@ -871,6 +860,3 @@ public abstract class TreeBasedTask extends StarTeamTask {
} }


} }




Loading…
Cancel
Save