Skip to content

Commit eb07b1a

Browse files
committed
Cleanedup JavaDoc Issues
Removed legacy SVN id's.
1 parent 24a2538 commit eb07b1a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+119
-122
lines changed

src/main/java/org/codehaus/plexus/interpolation/AbstractFunctionValueSourceWrapper.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,9 @@
2424
* {@link AbstractFunctionValueSourceWrapper#executeFunction(String, Object)}
2525
* together. The result of this is returned as the resolved value for the second
2626
* expression.
27-
* <br/>
28-
* This allows the first expression to be a function name that modifies the
27+
* <p>This allows the first expression to be a function name that modifies the
2928
* value of the second expression, which is resolved from the wrapped value
30-
* source.
31-
* @version $Id$
29+
* source.</p>
3230
*/
3331
public abstract class AbstractFunctionValueSourceWrapper
3432
implements ValueSource
@@ -74,6 +72,7 @@ public Object getValue( String expression )
7472

7573
/**
7674
* Retrieve the embedded value source.
75+
* @return {@link ValueSource}
7776
*/
7877
protected ValueSource getValueSource()
7978
{

src/main/java/org/codehaus/plexus/interpolation/BasicInterpolator.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,33 @@ public interface BasicInterpolator
2424
{
2525
/**
2626
* See {@link org.codehaus.plexus.interpolation.Interpolator#interpolate(String, String, org.codehaus.plexus.interpolation.RecursionInterceptor)}.
27-
* <br/>
27+
* <p>
2828
* This method triggers the use of a {@link org.codehaus.plexus.interpolation.SimpleRecursionInterceptor}
2929
* instance for protection against expression cycles. It also leaves empty the
3030
* expression prefix which would otherwise be trimmed from expressions. The
31-
* result is that any detected expression will be resolved as-is.
31+
* result is that any detected expression will be resolved as-is.</p>
3232
*
3333
* @param input The input string to interpolate
34+
* @return the interpolated string.
35+
* @throws InterpolationException in case of an error.
3436
*/
3537
String interpolate( String input )
3638
throws InterpolationException;
3739

3840
/**
3941
* See {@link org.codehaus.plexus.interpolation.Interpolator#interpolate(String, String, org.codehaus.plexus.interpolation.RecursionInterceptor)}.
40-
* <br/>
42+
* <p>
4143
* This method leaves empty the expression prefix which would otherwise be
4244
* trimmed from expressions. The result is that any detected expression will
43-
* be resolved as-is.
45+
* be resolved as-is.</p>
4446
*
4547
* @param input The input string to interpolate
4648
*
4749
* @param recursionInterceptor Used to protect the interpolation process
4850
* from expression cycles, and throw an
4951
* exception if one is detected.
52+
* @return the interpolated string.
53+
* @throws InterpolationException in case of an error.
5054
*/
5155
String interpolate( String input, RecursionInterceptor recursionInterceptor )
5256
throws InterpolationException;

src/main/java/org/codehaus/plexus/interpolation/EnvarBasedValueSource.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
* available from the underlying operating system (and possibly, the shell environment
2727
* that created the present Java process). If the expression starts with 'env.',
2828
* this prefix is trimmed before resolving the rest as an environment variable name.
29-
*
30-
* @version $Id$
3129
*/
3230
public class EnvarBasedValueSource
3331
extends AbstractValueSource
@@ -43,7 +41,7 @@ public class EnvarBasedValueSource
4341
* Create a new value source for interpolation based on shell environment variables. In this
4442
* case, envar keys ARE CASE SENSITIVE.
4543
*
46-
* @throws IOException
44+
* @throws IOException in case of an error.
4745
*/
4846
public EnvarBasedValueSource() throws IOException
4947
{
@@ -55,7 +53,7 @@ public EnvarBasedValueSource() throws IOException
5553
*
5654
* @param caseSensitive Whether the environment variable key should be treated in a
5755
* case-sensitive manner for lookups
58-
* @throws IOException
56+
* @throws IOException in case of an error.
5957
*/
6058
public EnvarBasedValueSource( boolean caseSensitive ) throws IOException
6159
{

src/main/java/org/codehaus/plexus/interpolation/FeedbackEnabledValueSource.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
* about what may have gone wrong while resolving the value for an expression.
2323
*
2424
* @author jdcasey
25-
* @version $Id$
2625
*
2726
* @deprecated Rolled into {@link ValueSource} now.
2827
*/

src/main/java/org/codehaus/plexus/interpolation/InterpolationException.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
* being thrown. Instead, they should be reported in the feedback from the {@link ValueSource},
2626
* which is propagated out through {@link Interpolator#getFeedback()}.
2727
*
28-
* @version $Id$
2928
*/
3029
public class InterpolationException
3130
extends Exception

src/main/java/org/codehaus/plexus/interpolation/InterpolationPostProcessor.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
/**
2020
* Used to allow full recursion of value interpolation before applying some rule
2121
* to the result.
22-
* @version $Id$
2322
*/
2423
public interface InterpolationPostProcessor
2524
{

src/main/java/org/codehaus/plexus/interpolation/Interpolator.java

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
* Interpolator interface. Based on existing RegexBasedInterpolator interface.
2323
*
2424
* @author cstamas
25-
* @version $Id$
2625
*/
2726
public interface Interpolator
2827
extends BasicInterpolator
@@ -31,36 +30,42 @@ public interface Interpolator
3130
/**
3231
* Add a new {@link ValueSource} to the stack used to resolve expressions
3332
* in this interpolator instance.
33+
* @param valueSource {@link ValueSource}.
3434
*/
3535
void addValueSource( ValueSource valueSource );
3636

3737
/**
3838
* Remove the specified {@link ValueSource} from the stack used to resolve
3939
* expressions in this interpolator instance.
40+
* @param valueSource {@link ValueSource}.
4041
*/
4142
void removeValuesSource( ValueSource valueSource );
4243

4344
/**
4445
* Add a new post-processor to handle final processing after
4546
* recursively-interpolated value is determined.
47+
* @param postProcessor {@link InterpolationPostProcessor}.
4648
*/
4749
void addPostProcessor( InterpolationPostProcessor postProcessor );
4850

4951
/**
5052
* Remove the given post-processor.
53+
* @param postProcessor {@link InterpolationPostProcessor}.
5154
*/
5255
void removePostProcessor( InterpolationPostProcessor postProcessor );
5356

5457
/**
5558
* See {@link Interpolator#interpolate(String, String, RecursionInterceptor)}.
56-
* <br/>
59+
* <p>
5760
* This method triggers the use of a {@link SimpleRecursionInterceptor}
58-
* instance for protection against expression cycles.
61+
* instance for protection against expression cycles.</p>
5962
*
6063
* @param input The input string to interpolate
6164
*
6265
* @param thisPrefixPattern An optional pattern that should be trimmed from
6366
* the start of any expressions found in the input.
67+
* @return interpolated string.
68+
* @throws InterpolationException in case of an error.
6469
*/
6570
String interpolate( String input,
6671
String thisPrefixPattern )
@@ -81,6 +86,8 @@ String interpolate( String input,
8186
* @param recursionInterceptor Used to protect the interpolation process
8287
* from expression cycles, and throw an
8388
* exception if one is detected.
89+
* @return interpolated string.
90+
* @throws InterpolationException in case of an error.
8491
*/
8592
String interpolate( String input,
8693
String thisPrefixPattern,
@@ -103,8 +110,14 @@ String interpolate( String input,
103110
*/
104111
void clearFeedback();
105112

113+
/**
114+
* @return state of the cacheAnswers
115+
*/
106116
boolean isCacheAnswers();
107117

118+
/**
119+
* @param cacheAnswers true/false.
120+
*/
108121
void setCacheAnswers( boolean cacheAnswers );
109122

110123
void clearAnswers();

src/main/java/org/codehaus/plexus/interpolation/InterpolatorFilterReader.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
* implementation. This implementation is heavily based on org.codehaus.plexus.util.InterpolationFilterReader.
6464
*
6565
* @author cstamas
66-
* @version $Id$
6766
*/
6867
public class InterpolatorFilterReader
6968
extends FilterReader

src/main/java/org/codehaus/plexus/interpolation/MapBasedValueSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
/**
2222
* Wraps a Map, and looks up the whole expression as a single key, returning the
2323
* value mapped to it.
24-
* @version $Id$
2524
*/
2625
public class MapBasedValueSource
2726
extends AbstractValueSource
@@ -31,6 +30,7 @@ public class MapBasedValueSource
3130

3231
/**
3332
* Construct a new value source to wrap the supplied map.
33+
* @param values key,value of mapping.
3434
*/
3535
public MapBasedValueSource( Map values )
3636
{

src/main/java/org/codehaus/plexus/interpolation/ObjectBasedValueSource.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
* supplied object is the root. Expressions like 'child.name' will translate into
2424
* 'rootObject.getChild().getName()' for non-boolean properties, and
2525
* 'rootObject.getChild().isName()' for boolean properties.
26-
* @version $Id$
2726
*/
2827
public class ObjectBasedValueSource
2928
extends AbstractValueSource
@@ -35,6 +34,7 @@ public class ObjectBasedValueSource
3534
* Construct a new value source, using the supplied object as the root from
3635
* which to start, and using expressions split at the dot ('.') to navigate
3736
* the object graph beneath this root.
37+
* @param root the root of the graph.
3838
*/
3939
public ObjectBasedValueSource( Object root )
4040
{
@@ -43,14 +43,14 @@ public ObjectBasedValueSource( Object root )
4343
}
4444

4545
/**
46-
* Split the expression into parts, tokenized on the dot ('.') character. Then,
46+
* <p>Split the expression into parts, tokenized on the dot ('.') character. Then,
4747
* starting at the root object contained in this value source, apply each part
4848
* to the object graph below this root, using either 'getXXX()' or 'isXXX()'
4949
* accessor types to resolve the value for each successive expression part.
50-
* Finally, return the result of the last expression part's resolution.
51-
* <br/>
52-
* <b>NOTE:</b> The object-graph nagivation actually takes place via the
53-
* {@link ReflectionValueExtractor} class.
50+
* Finally, return the result of the last expression part's resolution.</p>
51+
*
52+
* <p><b>NOTE:</b> The object-graph nagivation actually takes place via the
53+
* {@link ReflectionValueExtractor} class.</p>
5454
*/
5555
public Object getValue( String expression )
5656
{

0 commit comments

Comments
 (0)