#37 shakila3

オープン
shakila3 が 2 個のコミットを shakila3/ZCW-MetricConversions-BlueJ:master から master へマージしようとしています
共有6 個のファイルを変更した129 個の追加23 個の削除を含む
  1. バイナリ
      ConversionTool.class
  2. 21
    0
      ConversionTool.ctxt
  3. 58
    16
      ConversionTool.java
  4. バイナリ
      ConversionToolSpec.class
  5. 43
    0
      ConversionToolSpec.ctxt
  6. 7
    7
      package.bluej

バイナリ
ConversionTool.class ファイルの表示


+ 21
- 0
ConversionTool.ctxt ファイルの表示

@@ -0,0 +1,21 @@
1
+#BlueJ class context
2
+comment0.target=ConversionTool
3
+comment1.params=args
4
+comment1.target=void\ main(java.lang.String[])
5
+comment2.params=centimeters
6
+comment2.target=float\ CentimetersToInches(float)
7
+comment3.params=inches
8
+comment3.target=float\ InchesToCentimeters(float)
9
+comment4.params=feet
10
+comment4.target=float\ FeetToMeters(float)
11
+comment5.params=meters
12
+comment5.target=float\ MetersToFeet(float)
13
+comment6.params=mph
14
+comment6.target=float\ MphToKph(float)
15
+comment7.params=kph
16
+comment7.target=float\ KphToMph(float)
17
+comment8.params=celsius
18
+comment8.target=float\ CelsiusToFahrenheit(float)
19
+comment9.params=fahrenheit
20
+comment9.target=float\ FahrenheitToCelsius(float)
21
+numComments=10

+ 58
- 16
ConversionTool.java ファイルの表示

@@ -1,21 +1,63 @@
1
+import java.lang.Math;
1 2
 public class ConversionTool {
2 3
 
3
-
4 4
     public static void main(String[] args){}
5 5
 
6
-    public static float CentimetersToInches(float centimeters){}
7
-
8
-    public static float InchesToCentimeters(float inches){}
9
-
10
-    public static float FeetToMeters(float feet){}
11
-
12
-    public static float MetersToFeet(float meters){}
13
-
14
-    public static float CelsiusToFahrenheit(float celsius){}
15
-
16
-    public static float FahrenheitToCelsius(float fahrenheit){}
17
-
18
-    public static float MphToKph(float mph){}
19
-
20
-    public static float KphToMph(float kph){}
6
+    public static float CentimetersToInches(float centimeters){
7
+        if (centimeters < 0){
8
+            return 0;}
9
+        else{    
10
+            float answer = centimeters * 0.393701f;
11
+            return answer;}
12
+    }
13
+
14
+    public static float InchesToCentimeters(float inches){
15
+        if (inches < 0){
16
+            return 0;}
17
+        else{    
18
+            float answer = inches * 2.54f;
19
+            return answer;}
20
+    }
21
+
22
+    public static float FeetToMeters(float feet){
23
+    if (feet < 0){
24
+            return 0;}
25
+        else{    
26
+        float answer = feet * 0.3048f;
27
+        return answer;}
28
+    }
29
+
30
+    public static float MetersToFeet(float meters){
31
+    if (meters < 0){
32
+            return 0;}
33
+        else{    
34
+        float answer = meters * 3.28084f;
35
+        return answer;}
36
+    }
37
+
38
+    public static float MphToKph(float mph){
39
+    if (mph < 0){
40
+            return 0;}
41
+        else{    
42
+        float answer = mph * 1.60934f;
43
+        return answer;}
44
+    }
45
+    
46
+    public static float KphToMph(float kph){
47
+    if (kph < 0){
48
+            return 0;}
49
+        else{    
50
+        float answer = kph * 0.621371f;
51
+        return answer;}
52
+    }
53
+    
54
+    public static float CelsiusToFahrenheit(float celsius){
55
+    float answer = (celsius * 1.8f)+32;
56
+        return answer;
57
+    }
58
+    
59
+    public static float FahrenheitToCelsius(float fahrenheit){
60
+    float answer = (fahrenheit-32)/1.8f;
61
+    return answer;
62
+    }
21 63
 }

バイナリ
ConversionToolSpec.class ファイルの表示


+ 43
- 0
ConversionToolSpec.ctxt ファイルの表示

@@ -0,0 +1,43 @@
1
+#BlueJ class context
2
+comment0.target=ConversionToolSpec
3
+comment1.params=
4
+comment1.target=void\ shouldConvertCentimetersToInches()
5
+comment10.params=
6
+comment10.target=void\ shouldConvertMetersToFeet()
7
+comment11.params=
8
+comment11.target=void\ shouldConvertZeroMetersToZeroFeet()
9
+comment12.params=
10
+comment12.target=void\ shouldConvertNegativeMetersToZeroFeet()
11
+comment13.params=
12
+comment13.target=void\ shouldConvertFahrenheitToCelsius()
13
+comment14.params=
14
+comment14.target=void\ shouldConvertCelsiusToFahrenheit()
15
+comment15.params=
16
+comment15.target=void\ shouldConvertMphToKph()
17
+comment16.params=
18
+comment16.target=void\ shouldConvertZeroMphToZeroKph()
19
+comment17.params=
20
+comment17.target=void\ shouldConvertNegativeMphToZeroKph()
21
+comment18.params=
22
+comment18.target=void\ shouldConvertKphToMph()
23
+comment19.params=
24
+comment19.target=void\ shouldConvertZeroKphToZeroMph()
25
+comment2.params=
26
+comment2.target=void\ shouldConvertZeroCentimetersToZeroInches()
27
+comment20.params=
28
+comment20.target=void\ shouldConvertNegativeKphToZeroMph()
29
+comment3.params=
30
+comment3.target=void\ shouldConvertNegativeCentimetersToZeroInches()
31
+comment4.params=
32
+comment4.target=void\ shouldConvertInchesToCentimeters()
33
+comment5.params=
34
+comment5.target=void\ shouldConvertZeroInchesToZeroCentimeters()
35
+comment6.params=
36
+comment6.target=void\ shouldConvertNegativeInchesToZeroCentimeters()
37
+comment7.params=
38
+comment7.target=void\ shouldConvertFeetToMeters()
39
+comment8.params=
40
+comment8.target=void\ shouldConvertZeroFeetToZeroMeters()
41
+comment9.params=
42
+comment9.target=void\ shouldConvertNegativeFeetToZeroMeters()
43
+numComments=21

+ 7
- 7
package.bluej ファイルの表示

@@ -2,18 +2,18 @@
2 2
 dependency1.from=ConversionToolSpec
3 3
 dependency1.to=ConversionTool
4 4
 dependency1.type=UsesDependency
5
-editor.fx.0.height=722
6
-editor.fx.0.width=800
7
-editor.fx.0.x=320
8
-editor.fx.0.y=75
5
+editor.fx.0.height=0
6
+editor.fx.0.width=0
7
+editor.fx.0.x=0
8
+editor.fx.0.y=0
9 9
 objectbench.height=164
10
-objectbench.width=776
10
+objectbench.width=461
11 11
 package.divider.horizontal=0.6
12 12
 package.divider.vertical=0.6845018450184502
13 13
 package.editor.height=364
14 14
 package.editor.width=674
15 15
 package.editor.x=419
16
-package.editor.y=221
16
+package.editor.y=132
17 17
 package.frame.height=600
18 18
 package.frame.width=800
19 19
 package.numDependencies=1
@@ -29,7 +29,7 @@ readme.y=10
29 29
 target1.height=50
30 30
 target1.name=ConversionToolSpec
31 31
 target1.showInterface=false
32
-target1.type=ClassTarget
32
+target1.type=UnitTestTargetJunit4
33 33
 target1.width=150
34 34
 target1.x=130
35 35
 target1.y=10