Added division, subtraction, addition.. getNumber()

Calculations.java

@@ -100,7 +100,7 @@ public class Calculations
         while(matcher.find()){
             String number = matcher.group().trim();
             Double deci = Double.valueOf(number);
-            System.out.println(deci);
+            
             results.add(deci);
         }
         
@@ -111,6 +111,40 @@ public class Calculations
         return null;
     }
     
+    public static ArrayList<Double> getNumber(String userInput){
+        ArrayList<Double> results = new ArrayList<Double>();
+        
+        //takes in a string
+        //finds the first occurence of a number
+        //store it as a double ( left )
+        //add this to the arraylist
+        //find the second occurence of a number
+        //store it as a double (right)
+        //add this to the array list
+        //if the size of the arraylist is 2
+            //return the array list
+        //else return null'
+        
+        Pattern pattern = Pattern.compile("\\s?\\-?\\.?\\d+\\.?(\\d+)?\\s?");
+        Matcher matcher = pattern.matcher(userInput);
+        
+        while(matcher.find()){
+            String number = matcher.group().trim();
+            Double deci = Double.valueOf(number);
+            
+            results.add(deci);
+            
+        }
+        
+        if(results.size() == 1)
+        { 
+            System.out.println(results.get(0));
+            return results;
+        }
+        
+        return null;
+    }
+    
     public static String Multiply(String userInput)
     {
         String result = "";
@@ -130,15 +164,33 @@ public class Calculations
         //perform the operation
         //convert to string
         //return string
-        return null;
+        String result = "";
+        ArrayList<Double> results = getNumbers(userInput);
+        if(results != null)
+        {
+            Double quotient = results.get(0) / results.get(1);
+            result = String.valueOf(quotient);
+            return result;
+        } else {
+            return invalidArgumentsAmountError;
+        }
+        
+        
     } 
 
         public static String Add(String userInput)
     {
-        //perform the operation
-        //convert to string
-        //return string
-        return null;
+        String result = "";
+        ArrayList<Double> results = getNumbers(userInput);
+        if(results != null)
+        {
+            Double sum = results.get(0) + results.get(1);
+            result = String.valueOf(sum);
+            return result;
+        } else {
+            return invalidArgumentsAmountError;
+        }
+        
     }
     
     public static String Subtract(String userInput)
@@ -146,7 +198,17 @@ public class Calculations
         //perform the operation
         //convert to string
         //return string
-        return null;
+        String result = "";
+        ArrayList<Double> results = getNumbers(userInput);
+        if(results != null)
+        {
+            Double difference = results.get(0) - results.get(1);
+            result = String.valueOf(difference);
+            return result;
+        } else {
+            return invalidArgumentsAmountError;
+        }
+        
     }
  
     public static String InvertSign(String userInput)

package.bluej

@@ -8,19 +8,19 @@ dependency2.type=UsesDependency
 dependency3.from=Calculations
 dependency3.to=Console
 dependency3.type=UsesDependency
-editor.fx.0.height=800
-editor.fx.0.width=1280
-editor.fx.0.x=0
-editor.fx.0.y=0
-objectbench.height=200
+editor.fx.0.height=709
+editor.fx.0.width=800
+editor.fx.0.x=240
+editor.fx.0.y=23
+objectbench.height=198
 objectbench.width=595
 package.divider.horizontal=0.6
-package.divider.vertical=0.6854103343465046
-package.editor.height=428
+package.divider.vertical=0.685099846390169
+package.editor.height=439
 package.editor.width=493
 package.editor.x=35
 package.editor.y=23
-package.frame.height=716
+package.frame.height=709
 package.frame.width=619
 package.numDependencies=3
 package.numTargets=3
@@ -37,19 +37,19 @@ target1.name=Calculations
 target1.showInterface=false
 target1.type=ClassTarget
 target1.width=100
-target1.x=310
-target1.y=260
+target1.x=240
+target1.y=140
 target2.height=50
 target2.name=Console
 target2.showInterface=false
 target2.type=ClassTarget
 target2.width=80
-target2.x=190
-target2.y=160
-target3.height=120
+target2.x=30
+target2.y=200
+target3.height=50
 target3.name=MainApplication
 target3.showInterface=false
 target3.type=ClassTarget
-target3.width=230
-target3.x=320
-target3.y=20
+target3.width=120
+target3.x=70
+target3.y=70