NedRedmond 6 年 前
コミット
375eeed0fd
共有3 個のファイルを変更した78 個の追加46 個の削除を含む
  1. 1
    1
      __SHELL1.java
  2. 4
    3
      opSwitch.java
  3. 73
    42
      package.bluej

__SHELL9.java → __SHELL1.java ファイルの表示

@@ -1,5 +1,5 @@
1 1
 
2
-public class __SHELL9 extends bluej.runtime.Shell {
2
+public class __SHELL1 extends bluej.runtime.Shell {
3 3
 public static void run() throws Throwable {
4 4
 
5 5
 java.lang.String[] __bluej_param0 = { };

+ 4
- 3
opSwitch.java ファイルの表示

@@ -32,9 +32,7 @@ public class opSwitch
32 32
                 +"MC"+"\n"
33 33
                 +"MRC"+"\n"
34 34
                 +"nth root"+"\n"
35
-                +"log WIP"+"\n"
36
-                +"ln WIP"+"\n"
37
-                +"log (CHANGE OF BASE ) WIP"+"\n"
35
+                +"log"+"\n"
38 36
                 +"sin"+"\n"
39 37
                 +"cos"+"\n"
40 38
                 +"tan"+"\n"
@@ -119,6 +117,9 @@ public class opSwitch
119 117
             case "atan":
120 118
                 Trigonometry.tanInverse(op.currentNumber);
121 119
                 break;
120
+            case "made by":
121
+                System.out.println("Will Brown\nDe'Jon Johnson\nNed Redmond");
122
+                break;
122 123
         }
123 124
     }
124 125
 

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

@@ -2,40 +2,49 @@
2 2
 dependency1.from=ConsoleTest
3 3
 dependency1.to=Console
4 4
 dependency1.type=UsesDependency
5
-dependency2.from=Console
6
-dependency2.to=simpleOp
5
+dependency10.from=Console
6
+dependency10.to=opSwitch
7
+dependency10.type=UsesDependency
8
+dependency2.from=MainApplication
9
+dependency2.to=Console
7 10
 dependency2.type=UsesDependency
8
-dependency3.from=Console
9
-dependency3.to=opSwitch
11
+dependency3.from=Memory
12
+dependency3.to=Console
10 13
 dependency3.type=UsesDependency
11
-dependency4.from=MainApplication
12
-dependency4.to=simpleOp
14
+dependency4.from=advOp
15
+dependency4.to=Console
13 16
 dependency4.type=UsesDependency
14
-dependency5.from=MainApplication
17
+dependency5.from=opSwitch
15 18
 dependency5.to=Console
16 19
 dependency5.type=UsesDependency
17 20
 dependency6.from=opSwitch
18 21
 dependency6.to=simpleOp
19 22
 dependency6.type=UsesDependency
20 23
 dependency7.from=opSwitch
21
-dependency7.to=Console
24
+dependency7.to=Memory
22 25
 dependency7.type=UsesDependency
26
+dependency8.from=opSwitch
27
+dependency8.to=advOp
28
+dependency8.type=UsesDependency
29
+dependency9.from=opSwitch
30
+dependency9.to=Trigonometry
31
+dependency9.type=UsesDependency
23 32
 editor.fx.0.height=711
24 33
 editor.fx.0.width=802
25
-editor.fx.0.x=475
26
-editor.fx.0.y=24
34
+editor.fx.0.x=164
35
+editor.fx.0.y=74
27 36
 objectbench.height=199
28
-objectbench.width=444
37
+objectbench.width=871
29 38
 package.divider.horizontal=0.6
30
-package.divider.vertical=0.6845329249617151
31
-package.editor.height=424
32
-package.editor.width=342
33
-package.editor.x=0
34
-package.editor.y=23
35
-package.frame.height=711
36
-package.frame.width=468
37
-package.numDependencies=7
38
-package.numTargets=6
39
+package.divider.vertical=0.6859756097560976
40
+package.editor.height=443
41
+package.editor.width=769
42
+package.editor.x=16
43
+package.editor.y=105
44
+package.frame.height=714
45
+package.frame.width=895
46
+package.numDependencies=10
47
+package.numTargets=9
39 48
 package.showExtends=true
40 49
 package.showUses=true
41 50
 project.charset=UTF-8
@@ -49,41 +58,63 @@ target1.name=simpleOp
49 58
 target1.showInterface=false
50 59
 target1.type=ClassTarget
51 60
 target1.width=80
52
-target1.x=170
53
-target1.y=210
54
-target2.association=ConsoleTest
61
+target1.x=220
62
+target1.y=170
55 63
 target2.height=50
56
-target2.name=Console
64
+target2.name=advOp
57 65
 target2.showInterface=false
58 66
 target2.type=ClassTarget
59 67
 target2.width=80
60
-target2.x=100
61
-target2.y=110
68
+target2.x=350
69
+target2.y=170
62 70
 target3.height=50
63
-target3.name=opSwitch
71
+target3.name=Memory
64 72
 target3.showInterface=false
65 73
 target3.type=ClassTarget
66 74
 target3.width=80
67
-target3.x=30
68
-target3.y=170
75
+target3.x=70
76
+target3.y=10
69 77
 target4.height=50
70
-target4.name=Trigonometry
78
+target4.name=opSwitch
71 79
 target4.showInterface=false
72 80
 target4.type=ClassTarget
73
-target4.width=110
74
-target4.x=40
75
-target4.y=280
81
+target4.width=80
82
+target4.x=30
83
+target4.y=170
84
+target5.association=ConsoleTest
76 85
 target5.height=50
77
-target5.name=ConsoleTest
86
+target5.name=Console
78 87
 target5.showInterface=false
79
-target5.type=UnitTestTargetJunit4
88
+target5.type=ClassTarget
80 89
 target5.width=80
81
-target5.x=130
82
-target5.y=80
90
+target5.x=100
91
+target5.y=110
83 92
 target6.height=50
84
-target6.name=MainApplication
93
+target6.name=TrigonometryTest
85 94
 target6.showInterface=false
86
-target6.type=ClassTarget
87
-target6.width=120
88
-target6.x=210
89
-target6.y=10
95
+target6.type=UnitTestTargetJunit4
96
+target6.width=110
97
+target6.x=70
98
+target6.y=250
99
+target7.association=TrigonometryTest
100
+target7.height=50
101
+target7.name=Trigonometry
102
+target7.showInterface=false
103
+target7.type=ClassTarget
104
+target7.width=110
105
+target7.x=40
106
+target7.y=280
107
+target8.height=50
108
+target8.name=ConsoleTest
109
+target8.showInterface=false
110
+target8.type=UnitTestTargetJunit4
111
+target8.width=80
112
+target8.x=130
113
+target8.y=80
114
+target9.height=50
115
+target9.name=MainApplication
116
+target9.showInterface=false
117
+target9.type=ClassTarget
118
+target9.width=120
119
+target9.x=210
120
+target9.y=10