Pārlūkot izejas kodu

This is less messy

Allison Ziegler 6 gadus atpakaļ
vecāks
revīzija
58a3b1ebf3
2 mainītis faili ar 25 papildinājumiem un 53 dzēšanām
  1. 8
    36
      NumberUtilities.java
  2. 17
    17
      package.bluej

+ 8
- 36
NumberUtilities.java Parādīt failu

@@ -4,23 +4,11 @@
4 4
 public class NumberUtilities {
5 5
     
6 6
     public static String getRange(int stop) {
7
-        StringBuilder range = new StringBuilder();
8
-        
9
-        for (int i = 0; i < stop; i++) {
10
-            range.append(i);
11
-        }
12
-        
13
-        return range.toString();
7
+        return getRange(0, stop, 1);
14 8
     }
15 9
     
16 10
     public static String getRange(int start, int stop) {
17
-        StringBuilder range = new StringBuilder();
18
-        
19
-        for (int i = start; i < stop; i++) {
20
-            range.append(i);
21
-        }
22
-        
23
-        return range.toString();
11
+        return getRange(start, stop, 1);
24 12
     }
25 13
 
26 14
 
@@ -35,32 +23,16 @@ public class NumberUtilities {
35 23
     }
36 24
     
37 25
     public static String getEvenNumbers(int start, int stop) {
38
-        StringBuilder range = new StringBuilder();
39
-        //Start on an even number.
40
-        if (start % 2 == 1) {
41
-            start += 1;
42
-        }
43
-        
44
-        for (int i = start; i < stop; i += 2) {
45
-            range.append(i);
46
-        }
47
-        
48
-        return range.toString();
26
+        //Start on an even number, step by 2
27
+        start = (start % 2) == 1 ? start + 1 : start;
28
+        return getRange(start, stop, 2);
49 29
     }
50 30
 
51 31
 
52 32
     public static String getOddNumbers(int start, int stop) {
53
-        StringBuilder range = new StringBuilder();
54
-        //Start on an odd number.
55
-        if (start % 2 == 0) {
56
-            start += 1;
57
-        }
58
-        
59
-        for (int i = start; i < stop; i += 2) {
60
-            range.append(i);
61
-        }
62
-        
63
-        return range.toString();
33
+        //Start on an odd number, step by 2
34
+        start = (start % 2) == 0 ? start + 1 : start;
35
+        return getRange(start, stop, 2);
64 36
     }
65 37
 
66 38
 

+ 17
- 17
package.bluej Parādīt failu

@@ -1,27 +1,27 @@
1 1
 #BlueJ package file
2
-dependency1.from=NumberUtilitiesTest
3
-dependency1.to=NumberUtilities
2
+dependency1.from=TableUtilitiesTest
3
+dependency1.to=TableUtilities
4 4
 dependency1.type=UsesDependency
5 5
 dependency2.from=TriangleUtilitiesTest
6 6
 dependency2.to=TriangleUtilities
7 7
 dependency2.type=UsesDependency
8
-dependency3.from=TableUtilitiesTest
9
-dependency3.to=TableUtilities
8
+dependency3.from=NumberUtilitiesTest
9
+dependency3.to=NumberUtilities
10 10
 dependency3.type=UsesDependency
11
-editor.fx.0.height=722
12
-editor.fx.0.width=800
13
-editor.fx.0.x=537
14
-editor.fx.0.y=28
15
-objectbench.height=164
16
-objectbench.width=484
11
+editor.fx.0.height=0
12
+editor.fx.0.width=0
13
+editor.fx.0.x=0
14
+editor.fx.0.y=0
15
+objectbench.height=334
16
+objectbench.width=876
17 17
 package.divider.horizontal=0.6
18
-package.divider.vertical=0.7560627674750356
19
-package.editor.height=523
20
-package.editor.width=382
21
-package.editor.x=20
22
-package.editor.y=57
23
-package.frame.height=759
24
-package.frame.width=508
18
+package.divider.vertical=0.4817629179331307
19
+package.editor.height=310
20
+package.editor.width=758
21
+package.editor.x=98
22
+package.editor.y=23
23
+package.frame.height=716
24
+package.frame.width=900
25 25
 package.numDependencies=3
26 26
 package.numTargets=6
27 27
 package.showExtends=true