Jacob Andersen 6 years ago
parent
commit
beafb32434
2 changed files with 18 additions and 10 deletions
  1. 11
    3
      MainApplication.java
  2. 7
    7
      package.bluej

+ 11
- 3
MainApplication.java View File

@@ -5,13 +5,21 @@
5 5
  */
6 6
 public class MainApplication {
7 7
     public static void main(String[] args) {
8
+        
9
+        double Display = 0;
10
+        int num_system = 1;
11
+        double memory = 0;
12
+        
8 13
         Console.println("Welcome to my calculator!");
14
+        Console.println("Choose your option : ");
15
+        
9 16
         String s = Console.getStringInput("Enter a string");
17
+        
18
+        while (s != "quit") {
19
+            
10 20
         Integer i = Console.getIntegerInput("Enter an integer");
11 21
         Double d = Console.getDoubleInput("Enter a double.");
22
+    }
12 23
 
13
-        Console.println("The user input %s as a string", s);
14
-        Console.println("The user input %s as a integer", i);
15
-        Console.println("The user input %s as a d", d);
16 24
     }
17 25
 }

+ 7
- 7
package.bluej View File

@@ -2,19 +2,19 @@
2 2
 dependency1.from=MainApplication
3 3
 dependency1.to=Console
4 4
 dependency1.type=UsesDependency
5
-editor.fx.0.height=722
5
+editor.fx.0.height=717
6 6
 editor.fx.0.width=800
7
-editor.fx.0.x=640
7
+editor.fx.0.x=480
8 8
 editor.fx.0.y=23
9
-objectbench.height=214
9
+objectbench.height=101
10 10
 objectbench.width=595
11 11
 package.divider.horizontal=0.6
12
-package.divider.vertical=0.6847360912981455
13
-package.editor.height=473
12
+package.divider.vertical=0.8358662613981763
13
+package.editor.height=543
14 14
 package.editor.width=493
15 15
 package.editor.x=35
16
-package.editor.y=60
17
-package.frame.height=759
16
+package.editor.y=23
17
+package.frame.height=716
18 18
 package.frame.width=619
19 19
 package.numDependencies=1
20 20
 package.numTargets=2