Merge: Some Patrick's one liner fixes
authorJaroslav Tulach <jtulach@netbeans.org>
Sat, 14 Jun 2008 10:01:36 +0200
changeset 187e8db9f297016
parent 186 09d10795f55c
child 188 71ecc458ecd0
Merge: Some Patrick's one liner fixes
samples/composition/build.xml
samples/composition/src-api1.0/api/Arithmetica.java
samples/composition/src-api2.0-compat/api/Arithmetica.java
samples/composition/src-api2.0-enum/api/Arithmetica.java
samples/composition/src-api2.0-property/api/Arithmetica.java
samples/composition/src-api2.0-runtime/api/Arithmetica.java
samples/composition/src-api2.0/api/Arithmetica.java
     1.1 --- a/samples/composition/build.xml	Sat Jun 14 10:01:34 2008 +0200
     1.2 +++ b/samples/composition/build.xml	Sat Jun 14 10:01:36 2008 +0200
     1.3 @@ -95,6 +95,7 @@
     1.4              destdir="build/${version}/classes" 
     1.5              source="1.5" target="1.5"
     1.6              classpath="${cp}"
     1.7 +            debug="true"
     1.8          />
     1.9      </target>
    1.10  </project>
     2.1 --- a/samples/composition/src-api1.0/api/Arithmetica.java	Sat Jun 14 10:01:34 2008 +0200
     2.2 +++ b/samples/composition/src-api1.0/api/Arithmetica.java	Sat Jun 14 10:01:36 2008 +0200
     2.3 @@ -12,6 +12,9 @@
     2.4      }
     2.5      
     2.6      public int sumAll(int... numbers) {
     2.7 +        if (numbers.length == 0) {
     2.8 +            return 0;
     2.9 +        }
    2.10          int sum = numbers[0];
    2.11          for (int i = 1; i < numbers.length; i++) {
    2.12              sum = sumTwo(sum, numbers[i]);
     3.1 --- a/samples/composition/src-api2.0-compat/api/Arithmetica.java	Sat Jun 14 10:01:34 2008 +0200
     3.2 +++ b/samples/composition/src-api2.0-compat/api/Arithmetica.java	Sat Jun 14 10:01:36 2008 +0200
     3.3 @@ -23,6 +23,9 @@
     3.4      }
     3.5      
     3.6      public int sumAll(int... numbers) {
     3.7 +        if (numbers.length == 0) {
     3.8 +            return 0;
     3.9 +        }
    3.10          int sum = numbers[0];
    3.11          for (int i = 1; i < numbers.length; i++) {
    3.12              sum = sumTwo(sum, numbers[i]);
     4.1 --- a/samples/composition/src-api2.0-enum/api/Arithmetica.java	Sat Jun 14 10:01:34 2008 +0200
     4.2 +++ b/samples/composition/src-api2.0-enum/api/Arithmetica.java	Sat Jun 14 10:01:36 2008 +0200
     4.3 @@ -36,6 +36,9 @@
     4.4      }
     4.5      
     4.6      public int sumAll(int... numbers) {
     4.7 +        if (numbers.length == 0) {
     4.8 +            return 0;
     4.9 +        }
    4.10          int sum = numbers[0];
    4.11          for (int i = 1; i < numbers.length; i++) {
    4.12              sum = sumTwo(sum, numbers[i]);
     5.1 --- a/samples/composition/src-api2.0-property/api/Arithmetica.java	Sat Jun 14 10:01:34 2008 +0200
     5.2 +++ b/samples/composition/src-api2.0-property/api/Arithmetica.java	Sat Jun 14 10:01:36 2008 +0200
     5.3 @@ -14,6 +14,9 @@
     5.4      }
     5.5      
     5.6      public int sumAll(int... numbers) {
     5.7 +        if (numbers.length == 0) {
     5.8 +            return 0;
     5.9 +        }
    5.10          int sum = numbers[0];
    5.11          for (int i = 1; i < numbers.length; i++) {
    5.12              sum = sumTwo(sum, numbers[i]);
     6.1 --- a/samples/composition/src-api2.0-runtime/api/Arithmetica.java	Sat Jun 14 10:01:34 2008 +0200
     6.2 +++ b/samples/composition/src-api2.0-runtime/api/Arithmetica.java	Sat Jun 14 10:01:36 2008 +0200
     6.3 @@ -15,6 +15,9 @@
     6.4      }
     6.5      
     6.6      public int sumAll(int... numbers) {
     6.7 +        if (numbers.length == 0) {
     6.8 +            return 0;
     6.9 +        }
    6.10          int sum = numbers[0];
    6.11          for (int i = 1; i < numbers.length; i++) {
    6.12              sum = sumTwo(sum, numbers[i]);
     7.1 --- a/samples/composition/src-api2.0/api/Arithmetica.java	Sat Jun 14 10:01:34 2008 +0200
     7.2 +++ b/samples/composition/src-api2.0/api/Arithmetica.java	Sat Jun 14 10:01:36 2008 +0200
     7.3 @@ -12,6 +12,9 @@
     7.4      }
     7.5      
     7.6      public int sumAll(int... numbers) {
     7.7 +        if (numbers.length == 0) {
     7.8 +            return 0;
     7.9 +        }
    7.10          int sum = numbers[0];
    7.11          for (int i = 1; i < numbers.length; i++) {
    7.12              sum = sumTwo(sum, numbers[i]);