Skip to content

Commit 343b471

Browse files
authored
Merge pull request #107 from Daniel-Dos/fix-javadoc
small fix in generated javadoc.
2 parents 7ff30b1 + ba20766 commit 343b471

23 files changed

+59
-41
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@
555555
<plugin>
556556
<groupId>org.apache.maven.plugins</groupId>
557557
<artifactId>maven-javadoc-plugin</artifactId>
558-
<version>3.0.0</version>
558+
<version>3.0.1</version>
559559
<configuration>
560560
<excludes>java.money</excludes>
561561
<excludePackageNames>java.money</excludePackageNames>
@@ -879,7 +879,7 @@
879879
<plugin>
880880
<groupId>org.apache.maven.plugins</groupId>
881881
<artifactId>maven-javadoc-plugin</artifactId>
882-
<version>2.9.1</version>
882+
<version>3.0.1</version>
883883
<inherited>true</inherited>
884884
<reportSets>
885885
<reportSet>

src/main/java/javax/money/AbstractContextBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public B set(String key, Object value) {
176176
* <i>type</i>.
177177
*
178178
* @param value the attribute value, not null.
179-
* @param key the attribute's key, not {@code null}
179+
* @param key the attribute's key, not {@code null}
180180
* @return this Builder, for chaining
181181
*/
182182
public <T> B set(Class<T> key, T value) {

src/main/java/javax/money/CurrencyUnit.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* <p>
2626
* Currencies can be distinguished by separate {@link #getCurrencyCode()} codes,
2727
* similar to {@link java.util.Currency}.
28-
* <h4>Implementation specification</h4>
28+
* <h3>Implementation specification</h3>
2929
* Implementation of this class
3030
* <ul>
3131
* <li>are required to implement {@code equals/hashCode} considering the

src/main/java/javax/money/MonetaryAmount.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
* </code></pre>
6868
* </blockquote></li>
6969
* </ul>
70-
* <h4>Implementation specification</h4>
70+
* <h3>Implementation specification</h3>
7171
* Implementations of this interface must be
7272
* <ul>
7373
* <li>thread-safe</li>
@@ -154,7 +154,7 @@ default <R> R query(MonetaryQuery<R> query){
154154
* <p>
155155
* Hereby also the method signature on the implementation type must return the concrete type, to
156156
* enable a fluent API, e.g.
157-
* <p>
157+
*
158158
* <blockquote>
159159
* <pre><code>
160160
* public final class MyMoney implements MonetaryAmount{
@@ -315,8 +315,8 @@ default boolean isZero(){
315315
MonetaryAmount subtract(MonetaryAmount amount);
316316

317317
/**
318-
* Returns a {@code MonetaryAmount} whose value is <tt>(this &times;
319-
* multiplicand)</tt>, and whose scale is <code>this.scale() +
318+
* Returns a {@code MonetaryAmount} whose value is <code>(this &times;
319+
* multiplicand)</code>, and whose scale is <code>this.scale() +
320320
* multiplicand.scale()</code>.
321321
*
322322
* @param multiplicand value to be multiplied by this {@code MonetaryAmount}.
@@ -327,8 +327,8 @@ default boolean isZero(){
327327
MonetaryAmount multiply(long multiplicand);
328328

329329
/**
330-
* Returns a {@code MonetaryAmount} whose value is <tt>(this &times;
331-
* multiplicand)</tt>, and whose scale is <code>this.scale() +
330+
* Returns a {@code MonetaryAmount} whose value is <code>(this &times;
331+
* multiplicand)</code>, and whose scale is <code>this.scale() +
332332
* multiplicand.scale()</code>.
333333
* By default the input value's scale will be rounded to
334334
* accommodate the format capabilities, and no {@link java.lang.ArithmeticException}
@@ -345,8 +345,8 @@ default boolean isZero(){
345345

346346

347347
/**
348-
* Returns a {@code MonetaryAmount} whose value is <tt>(this &times;
349-
* multiplicand)</tt>, and whose scale is <code>this.scale() +
348+
* Returns a {@code MonetaryAmount} whose value is <code>(this &times;
349+
* multiplicand)</code>, and whose scale is <code>this.scale() +
350350
* multiplicand.scale()</code>.
351351
*
352352
* @param multiplicand value to be multiplied by this {@code MonetaryAmount}. If the multiplicand's scale exceeds
@@ -402,7 +402,7 @@ default boolean isZero(){
402402

403403
/**
404404
* Returns a {@code MonetaryAmount} whose value is <code>this % divisor</code>.
405-
* <p>
405+
*
406406
* <p>
407407
* The remainder is given by
408408
* <code>this.subtract(this.divideToIntegralValue(divisor).multiply(divisor)</code> . Note that this
@@ -418,7 +418,7 @@ default boolean isZero(){
418418

419419
/**
420420
* Returns a {@code MonetaryAmount} whose value is <code>this % divisor</code>.
421-
* <p>
421+
*
422422
* <p>
423423
* The remainder is given by
424424
* <code>this.subtract(this.divideToIntegralValue(divisor).multiply(divisor)</code> . Note that this
@@ -434,7 +434,7 @@ default boolean isZero(){
434434

435435
/**
436436
* Returns a {@code MonetaryAmount} whose value is <code>this % divisor</code>.
437-
* <p>
437+
*
438438
* <p>
439439
* The remainder is given by
440440
* <code>this.subtract(this.divideToIntegralValue(divisor).multiply(divisor)</code> . Note that this
@@ -452,7 +452,7 @@ default boolean isZero(){
452452
* Returns a two-element {@code MonetaryAmount} array containing the result of
453453
* {@code divideToIntegralValue} followed by the result of {@code remainder} on the two
454454
* operands.
455-
* <p>
455+
*
456456
* <p>
457457
* Note that if both the integer quotient and remainder are needed, this method is faster than
458458
* using the {@code divideToIntegralValue} and {@code remainder} methods separately because the
@@ -475,7 +475,7 @@ default boolean isZero(){
475475
* Returns a two-element {@code MonetaryAmount} array containing the result of
476476
* {@code divideToIntegralValue} followed by the result of {@code remainder} on the two
477477
* operands.
478-
* <p>
478+
*
479479
* <p>
480480
* Note that if both the integer quotient and remainder are needed, this method is faster than
481481
* using the {@code divideToIntegralValue} and {@code remainder} methods separately because the
@@ -498,7 +498,7 @@ default boolean isZero(){
498498
* Returns a two-element {@code MonetaryAmount} array containing the result of
499499
* {@code divideToIntegralValue} followed by the result of {@code remainder} on the two
500500
* operands.
501-
* <p>
501+
*
502502
* <p>
503503
* Note that if both the integer quotient and remainder are needed, this method is faster than
504504
* using the {@code divideToIntegralValue} and {@code remainder} methods separately because the

src/main/java/javax/money/MonetaryAmountFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
* <li>{@code a.b.MyMoney.ctx.maxScale} to define the maximal supported scale.</li>
5252
* <li>{@code a.b.MyMoney.ctx.fixedScale} to define the scale to be fixed (constant).</li>
5353
* </ul>
54-
* <p>
54+
*
5555
* <h2>Implementation specification</h2> Instances of this interface are <b>not</b> required to be
5656
* thread-safe!
5757
*

src/main/java/javax/money/MonetaryContextBuilder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public MonetaryContextBuilder setFixedScale(boolean fixedScale) {
7676
/**
7777
* Set the MonetaryAmount implementation class.
7878
*
79+
* @param amountType the target amount type, not null.
7980
* @return the implementation class of the containing amount instance, never null.
8081
* @see javax.money.MonetaryAmount#getContext()
8182
*/

src/main/java/javax/money/MonetaryException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public MonetaryException(String message) {
4646
* {@link Throwable#getMessage()} method).
4747
* @param cause
4848
* the cause (which is saved for later retrieval by the
49-
* {@link Throwable#getCause()} method). (A <tt>null</tt> value
49+
* {@link Throwable#getCause()} method). (A <code>null</code> value
5050
* is permitted, and indicates that the cause is nonexistent or
5151
* unknown.)
5252
*/

src/main/java/javax/money/MonetaryOperator.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,13 @@
2424
* <p>
2525
* Examples might be an operator that rounds the amount to the nearest 1000, or
2626
* one that performs currency conversion.
27+
* </p>
28+
*
2729
* <p>
2830
* There are two equivalent ways of using a {@code MonetaryOperator}. The first
2931
* is to invoke the method on this interface. The second is to use
3032
* {@link MonetaryAmount#with(MonetaryOperator)}:
33+
* </p>
3134
*
3235
* <pre><code>
3336
* // these two lines are equivalent, but the second approach is recommended
@@ -38,21 +41,28 @@
3841
* It is recommended to use the second approach, {@code with(MonetaryOperator)},
3942
* as it is a lot clearer to read in code.
4043
*
41-
* <h4>Implementation specification</h4>
44+
* <h3>Implementation specification</h3>
45+
* <p>
4246
* The implementation must take the input object and apply it. The
4347
* implementation defines the logic of the operator and is responsible for
4448
* documenting that logic. It may use any method on {@code MonetaryAmount} to
4549
* determine the result.
50+
* </p>
51+
*
4652
* <p>
4753
* The input object must not be altered. Instead, an altered copy of the
4854
* original must be returned. This provides equivalent, safe behavior for
4955
* immutable and mutable monetary amounts.
56+
* </p>
57+
*
5058
* <p>
5159
* This method may be called from multiple threads in parallel. It must be
5260
* thread-safe when invoked.
61+
* </p>
5362
*
5463
* <p>
5564
* This interface extends {@code java.util.function.UnaryOperator} introduced by Java 8.
65+
* </p>
5666
*
5767
* @author Werner Keil
5868
* @author Anatole Tresch

src/main/java/javax/money/MonetaryQuery.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*
3838
* It is recommended to use the second approach, {@code query(MonetaryQuery)},
3939
* as it is a lot clearer to read in code.
40-
* <h4>Implementation specification</h4>
40+
* <h3>Implementation specification</h3>
4141
* This interface places no restrictions on the mutability of implementations,
4242
* however immutability is strongly recommended.
4343
*
@@ -72,7 +72,7 @@ public interface MonetaryQuery<R>{
7272
* It is recommended to use the second approach,
7373
* {@code query(MonetaryQuery)}, as it is a lot clearer to read in code.
7474
*
75-
* <h4>Implementation specification</h4>
75+
* <h3>Implementation specification</h3>
7676
* The implementation must take the input object and query it. The
7777
* implementation defines the logic of the query and is responsible for
7878
* documenting that logic. It may use any method on {@code MonetaryAmount}

src/main/java/javax/money/MonetaryRounding.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/**
2020
* Interface representing a monetary rounding. Rounding must not necessarily represent roundings in a pure arithmetical sense. Basically a rounding
2121
* can scale an amount arbitrarily.
22-
* <h4>Implementation specification</h4>
22+
* <h3>Implementation specification</h3>
2323
* Implementations of this interface must be
2424
* <ul>
2525
* <li>final</li>

0 commit comments

Comments
 (0)