classes for switching display modes and general display updated

SwitchModes.java

@@ -8,8 +8,26 @@
 public class SwitchModes
 {
     // instance variables - replace the example below with your own
-    public static int displayMode=1;
-    public static int unitMode=1;
+    private int displayMode=1;
+    private int unitMode=1;
+
+    SwitchModes sm = new SwitchModes();
+
+    public int getDisplayMode(){
+        return displayMode;
+    }
+
+    public void setDisplayMode(int mode){
+        displayMode=mode;
+    }
+
+    public int getUnitMode(){
+        return unitMode;
+    }
+
+    public void setUnitMode(int mode){
+        unitMode=mode;
+    }
 
     /**
      * Constructor for objects of class SwitchModes
@@ -25,10 +43,10 @@ public class SwitchModes
      * @param  y  a sample parameter for a method
      * @return    the sum of x and y
      */
-    
-public static void switchDisplayMode (String mode){
-mode.toLowerCase();
-    switch (mode) {
+
+    public void switchDisplayMode (String mode){
+        mode.toLowerCase();
+        switch (mode) {
             case "hex": { 
                 displayMode=1;
                 // call update display
@@ -50,8 +68,8 @@ mode.toLowerCase();
             }
         }
     }
-            
-    public static void switchDisplayMode(){
+
+    public void switchDisplayMode(){
         if (displayMode==4){
             displayMode=1;
             // call update display
@@ -63,18 +81,16 @@ mode.toLowerCase();
 
     }
 
-    public static void switchUnitsMode (String mode){
+    public void switchUnitsMode (String mode){
         if (mode.toLowerCase()=="degrees") {
             unitMode=1;
-            
+
         } else if(mode.toLowerCase()=="radians")
             unitMode=2;
-                
 
     }
-
-    public static void switchUnitsMode(){
-        if (displayMode==4){
+    public void switchUnitsMode(){
+        if (unitMode==2){
             unitMode=1;
             // call update display
         } 
@@ -85,5 +101,4 @@ mode.toLowerCase();
 
     }
 
-    
 }

UpdateDisplay.java

@@ -0,0 +1,45 @@
+
+/**
+ * Write a description of class UpdateDisplay here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+public class UpdateDisplay
+{
+    // instance variables - replace the example below with your own
+    private int x;
+
+    /**
+     * Constructor for objects of class UpdateDisplay
+     */
+    public UpdateDisplay(Double displayNumber)
+    {
+       
+        // initialise instance variables
+        //x = 0;
+    }
+
+    /**
+     * An example of a method - replace this comment with your own
+     *
+     * @param  y  a sample parameter for a method
+     * @return    the sum of x and y
+     */
+    
+    SwitchModes sm = new SwitchModes();
+    
+    public String UpdateDisplay(Double displayNumber)
+    {
+     String str="";
+     
+     
+     // update number system based on display mode variable (see SwitchModes class)
+     
+     
+     
+     return str;   
+    }
+}
+
+

package.bluej

@@ -2,22 +2,25 @@
 dependency1.from=MainApplication
 dependency1.to=Console
 dependency1.type=UsesDependency
-editor.fx.0.height=0
-editor.fx.0.width=0
+dependency2.from=UpdateDisplay
+dependency2.to=SwitchModes
+dependency2.type=UsesDependency
+editor.fx.0.height=977
+editor.fx.0.width=1920
 editor.fx.0.x=0
-editor.fx.0.y=0
+editor.fx.0.y=23
 objectbench.height=101
-objectbench.width=595
+objectbench.width=1896
 package.divider.horizontal=0.6
-package.divider.vertical=0.8358662613981763
-package.editor.height=543
-package.editor.width=493
-package.editor.x=35
+package.divider.vertical=0.8824809575625681
+package.editor.height=804
+package.editor.width=1794
+package.editor.x=0
 package.editor.y=23
-package.frame.height=716
-package.frame.width=619
-package.numDependencies=1
-package.numTargets=4
+package.frame.height=977
+package.frame.width=1920
+package.numDependencies=2
+package.numTargets=6
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -27,30 +30,44 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
-target1.name=Memory
+target1.name=UpdateDisplay
 target1.showInterface=false
 target1.type=ClassTarget
-target1.width=80
-target1.x=190
-target1.y=10
+target1.width=120
+target1.x=130
+target1.y=130
 target2.height=50
-target2.name=Console
+target2.name=Memory
 target2.showInterface=false
 target2.type=ClassTarget
 target2.width=80
-target2.x=80
-target2.y=200
+target2.x=190
+target2.y=10
 target3.height=50
-target3.name=SciCalculator
+target3.name=Console
 target3.showInterface=false
 target3.type=ClassTarget
-target3.width=110
-target3.x=70
-target3.y=10
+target3.width=80
+target3.x=80
+target3.y=200
 target4.height=50
-target4.name=MainApplication
+target4.name=SwitchModes
 target4.showInterface=false
 target4.type=ClassTarget
-target4.width=120
-target4.x=70
-target4.y=70
+target4.width=110
+target4.x=10
+target4.y=130
+target5.height=50
+target5.name=SciCalculator
+target5.showInterface=false
+target5.type=ClassTarget
+target5.width=110
+target5.x=70
+target5.y=10
+target6.height=50
+target6.name=MainApplication
+target6.showInterface=false
+target6.type=ClassTarget
+target6.width=120
+target6.x=70
+target6.y=70