Skip to content

Commit e0b40d9

Browse files
author
Otávio Santana
committed
Merge pull request #44 from wwadge/master
Fix some minor typos and gitignore IntelliJ folder
2 parents 1e323c9 + 10cb681 commit e0b40d9

File tree

7 files changed

+21
-20
lines changed

7 files changed

+21
-20
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ jsr354-ri.iml
66
-project
77
/.resourceCache
88
/.project
9+
/.idea
10+

src/main/java/org/javamoney/moneta/function/MonetarySummaryStatistics.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package org.javamoney.moneta.function;
22

3-
import java.util.Objects;
3+
import org.javamoney.moneta.FastMoney;
4+
import org.javamoney.moneta.spi.MoneyUtils;
45

56
import javax.money.CurrencyUnit;
67
import javax.money.MonetaryAmount;
7-
8-
import org.javamoney.moneta.FastMoney;
9-
import org.javamoney.moneta.spi.MoneyUtils;
8+
import java.util.Objects;
109

1110
/**
1211
* A state object for collecting statistics such as count, min, max, sum, and
@@ -26,7 +25,7 @@ public class MonetarySummaryStatistics {
2625

2726
private MonetaryAmount sum;
2827

29-
private MonetaryAmount avarage;
28+
private MonetaryAmount average;
3029

3130
/**
3231
* Creates a new instance, targeting the given {@link javax.money.CurrencyUnit}.
@@ -65,15 +64,15 @@ public MonetarySummaryStatistics combine(MonetarySummaryStatistics summaryStatis
6564
max = MonetaryFunctions.max(max, summaryStatistics.max);
6665
sum = sum.add(summaryStatistics.sum);
6766
count += summaryStatistics.count;
68-
avarage = sum.divide(count);
67+
average = sum.divide(count);
6968
return this;
7069
}
7170

7271
private void doSummary(MonetaryAmount moneraty) {
7372
min = MonetaryFunctions.min(min, moneraty);
7473
max = MonetaryFunctions.max(max, moneraty);
7574
sum = sum.add(moneraty);
76-
avarage = sum.divide(++count);
75+
average = sum.divide(++count);
7776
}
7877

7978
private boolean isEmpty() {
@@ -84,7 +83,7 @@ private void setSameMonetary(MonetaryAmount monetary) {
8483
min = monetary;
8584
max = monetary;
8685
sum = monetary;
87-
avarage = monetary;
86+
average = monetary;
8887
}
8988

9089
/**
@@ -123,8 +122,8 @@ public MonetaryAmount getSum() {
123122
* Get the mean average of all amounts added.
124123
* @return the mean average amount, or null if no amount was added to this summary instance.
125124
*/
126-
public MonetaryAmount getAvarage() {
127-
return avarage;
125+
public MonetaryAmount getAverage() {
126+
return average;
128127
}
129128

130129
@Override
@@ -134,7 +133,7 @@ public String toString() {
134133
sb.append("min:").append(min).append(",");
135134
sb.append("max:").append(max).append(",");
136135
sb.append("sum:").append(sum).append(",");
137-
sb.append("avarage:").append(avarage).append("]");
136+
sb.append("average:").append(average).append("]");
138137
return sb.toString();
139138
}
140139

src/main/java/org/javamoney/moneta/internal/DefaultCashRounding.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ final class DefaultCashRounding implements MonetaryRounding, Serializable{
7777
*
7878
* @param currency The currency, which determines the required precision. As
7979
* {@link RoundingMode}, by default, {@link RoundingMode#HALF_UP}
80-
* is sued.
80+
* is used.
8181
*/
8282
DefaultCashRounding(CurrencyUnit currency, RoundingMode roundingMode, int minimalMinors){
8383
this(currency.getDefaultFractionDigits(), roundingMode, minimalMinors);
@@ -89,7 +89,7 @@ final class DefaultCashRounding implements MonetaryRounding, Serializable{
8989
*
9090
* @param currency The currency, which determines the required precision. As
9191
* {@link RoundingMode}, by default, {@link RoundingMode#HALF_UP}
92-
* is sued.
92+
* is used.
9393
*/
9494
DefaultCashRounding(CurrencyUnit currency, int minimalMinors){
9595
this(currency, RoundingMode.HALF_UP, minimalMinors);

src/main/java/org/javamoney/moneta/internal/DefaultRounding.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ final class DefaultRounding implements MonetaryRounding, Serializable{
7575
*
7676
* @param currency The currency, which determines the required precision. As
7777
* {@link RoundingMode}, by default, {@link RoundingMode#HALF_UP}
78-
* is sued.
78+
* is used.
7979
*/
8080
DefaultRounding(CurrencyUnit currency, RoundingMode roundingMode){
8181
this(currency.getDefaultFractionDigits(), roundingMode);

src/test/java/org/javamoney/moneta/function/GroupMonetarySummaryStatisticsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ private GroupMonetarySummaryStatistics createGroupMonetary() {
128128
private void verifySummary(MonetarySummaryStatistics summary,
129129
int expectedAvarage, int expectedSumm, long count) {
130130
Assert.assertEquals(summary.getCount(), count);
131-
Assert.assertEquals(summary.getAvarage().getNumber()
131+
Assert.assertEquals(summary.getAverage().getNumber()
132132
.intValue(), expectedAvarage);
133133
Assert.assertEquals(summary.getSum().getNumber().intValue(),
134134
expectedSumm);

src/test/java/org/javamoney/moneta/function/MonetaryFunctionsAgregatorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public void summarizingMonetaryTest() {
112112
assertEquals(0L, summary.getMin().getNumber().longValue());
113113
assertEquals(10L, summary.getMax().getNumber().longValue());
114114
assertEquals(16L, summary.getSum().getNumber().longValue());
115-
assertEquals(2L, summary.getAvarage().getNumber().longValue());
115+
assertEquals(2L, summary.getAverage().getNumber().longValue());
116116

117117
}
118118

src/test/java/org/javamoney/moneta/function/MonetarySummaryStatisticsTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void shouldBeEmpty() {
2020
Assert.assertEquals(0L, summary.getMin().getNumber().longValue());
2121
Assert.assertEquals(0L, summary.getMax().getNumber().longValue());
2222
Assert.assertEquals(0L, summary.getSum().getNumber().longValue());
23-
Assert.assertEquals(0L, summary.getAvarage().getNumber().longValue());
23+
Assert.assertEquals(0L, summary.getAverage().getNumber().longValue());
2424

2525
}
2626

@@ -47,7 +47,7 @@ public void shouldBeSameValueWhenOneMonetaryIsAdded() {
4747
Assert.assertEquals(10L, summary.getMin().getNumber().longValue());
4848
Assert.assertEquals(10L, summary.getMax().getNumber().longValue());
4949
Assert.assertEquals(10L, summary.getSum().getNumber().longValue());
50-
Assert.assertEquals(10L, summary.getAvarage().getNumber().longValue());
50+
Assert.assertEquals(10L, summary.getAverage().getNumber().longValue());
5151
}
5252

5353
@Test
@@ -57,7 +57,7 @@ public void addTest() {
5757
Assert.assertEquals(10L, summary.getMin().getNumber().longValue());
5858
Assert.assertEquals(110L, summary.getMax().getNumber().longValue());
5959
Assert.assertEquals(210L, summary.getSum().getNumber().longValue());
60-
Assert.assertEquals(70L, summary.getAvarage().getNumber().longValue());
60+
Assert.assertEquals(70L, summary.getAverage().getNumber().longValue());
6161
}
6262

6363
@Test
@@ -69,7 +69,7 @@ public void combineTest() {
6969
Assert.assertEquals(10L, summaryA.getMin().getNumber().longValue());
7070
Assert.assertEquals(110L, summaryA.getMax().getNumber().longValue());
7171
Assert.assertEquals(420L, summaryA.getSum().getNumber().longValue());
72-
Assert.assertEquals(70L, summaryA.getAvarage().getNumber().longValue());
72+
Assert.assertEquals(70L, summaryA.getAverage().getNumber().longValue());
7373
}
7474

7575
private MonetarySummaryStatistics createSummary() {

0 commit comments

Comments
 (0)