Added return types

Author: MintyTheCoder

Java Calculators/bin/JavaCalculators/ConsoleCalculator.class

@@ -3,18 +3,14 @@
 import java.util.Scanner;
 
 /** Program that allows a person to use the Java console as a 4 function calculator 
- * @author Monty a.k.a MintyTheCoder & Brodie*/
+ * @author Monty a.k.a MintyTheCoder*/
 public class ConsoleCalculator 
 {
 	/** a float variable to store a number given by the user */
 	// float is a number with decimals
 	//declares two float variables to store numbers given by the user
 	public static float number1, number2; 
 
-	/** a float variable to store the outcome of the function used between number1 and number2 */
-	// declares a float variable to store the outcome of the function executed between number1 and number2
-	public static float answer;
-
 	/**  a String variable to store/know what function is given by the user */
 	//declares a string variable to store the function given by the user
 	static String function;
@@ -41,50 +37,58 @@ public void getNumbers()
 		System.out.println("Please enter the second number");
 
 		//store the number in the variable number2
-		number2 =  keyboard.nextFloat();
+		number2 = keyboard.nextFloat();
 
 		//print blank line
 		System.out.println(" ");
 	}
 
 	/** a method to add the numbers from getNumbers and print the sum in the console*/
 	//creates a method to add the numbers from getNumbers and print the sum in the console
-	public void doSum()
+	public float doSum()
 	{
 		//getNumbers();
-		answer = number1 + number2;
+		float sum;
+		sum = number1 + number2;
 		System.out.println("The sum of your two numbers is:");
-		System.out.println(answer);
+		System.out.println(sum);
+		return sum;
 	}
 
 	/** a method to multiply the numbers from getNumbers and print the product in the console*/
 	//creates a method to multiply the numbers from getNumbers and print the product in the console
-	public void doProduct()
+	public float doProduct()
 	{
 		//getNumbers();
-		answer = number1 * number2;
+		float product;
+		product = number1 * number2;
 		System.out.println("The product of your two numbers is:");
-		System.out.println(answer);
+		System.out.println(product);
+		return product;
 	}
 
 	/** a method to subtract the numbers from getNumbers and print the difference in the console*/
 	//creates a method to subtract the numbers from getNumbers and print the difference in the console
-	public void doDifference()
+	public float doDifference()
 	{
 		//getNumbers();
-		answer = number1 - number2;
+		float difference;
+		difference = number1 - number2;
 		System.out.println("The difference between your two numbers is:");
-		System.out.println(answer);
+		System.out.println(difference);
+		return difference;
 	}
 
 	/** a method to divide the numbers from getNumbers and print the quotient in the console*/
 	//create a method to divide the numbers from getNumbers and print the quotient in the console
-	public void doQuotient()
+	public float doQuotient()
 	{
 		//getNumbers();
-		answer = number1 / number2;
+		float quotient;
+		quotient = number1 / number2;
 		System.out.println("The quotient of your two numbers is:");
-		System.out.println(answer);
+		System.out.println(quotient);
+		return quotient;
 	}
 
 	/** main method that every Java project must have,

Java Calculators/bin/JavaCalculators/SwingCalculator$AdditionListener.class

@@ -15,8 +15,8 @@ public class SwingCalculator
 	static JFrame calcBox;
 
 	//create 2 text boxes for text input
-	static final JTextField textInput1 = new JTextField("Enter Your First Integer");
-	static final JTextField textInput2 = new JTextField("Enter Your Second Integer");
+	static final JTextField intInput1 = new JTextField("Enter Your First Integer");
+	static final JTextField intInput2 = new JTextField("Enter Your Second Integer");
 
 	//create an object out of the ConsoleCalculator script
 	static ConsoleCalculator calculator = new ConsoleCalculator();
@@ -53,17 +53,17 @@ public static void setup()
 		division.addActionListener(divideButton);
 
 		//connects Action Listeners to corresponding text fields
-		textInput1.addActionListener(text1);
-		textInput2.addActionListener(text2);
+		intInput1.addActionListener(text1);
+		intInput2.addActionListener(text2);
 
 		//adds buttons to window/GUI
-		calcBox.add(textInput1);
+		calcBox.add(intInput1);
 		calcBox.setLayout(new FlowLayout());    
 		calcBox.add(addition); 
 		calcBox.add(subtraction); 
 		calcBox.add(multiplication); 
 		calcBox.add(division);
-		calcBox.add(textInput2);
+		calcBox.add(intInput2);
 
 
 
@@ -84,7 +84,7 @@ public void actionPerformed(ActionEvent buttonPress)
 			//what happens when button is pressed
 			//sets the number1 variable to what the user puts in the text box
 			//Float.parseFloat changes input from a String to a float
-			ConsoleCalculator.number1 = Float.parseFloat(textInput1.getText());		
+			ConsoleCalculator.number1 = Float.parseFloat(intInput1.getText());		
 		}
 	}
 
@@ -97,7 +97,7 @@ public void actionPerformed(ActionEvent buttonPress)
 			//what happens when button is pressed
 			//sets the number2 variable to what the user puts in the text box
 			//Float.parseFloat changes input from a String to a float
-			ConsoleCalculator.number2 = Float.parseFloat(textInput2.getText());
+			ConsoleCalculator.number2 = Float.parseFloat(intInput2.getText());
 		}
 	}
 
@@ -110,9 +110,10 @@ public void actionPerformed(ActionEvent buttonPress)
 		{
 			//what happens when button is pressed
 			System.out.println("Addition Selected");
-			calculator.doSum();
-			JLabel label = new JLabel(Float.toString(ConsoleCalculator.answer));
+			//calculator.doSum();
+			JLabel label = new JLabel(" = " + calculator.doSum());
 			calcBox.add(label);
+			
 			calcBox.invalidate();
 			calcBox.validate();
 			calcBox.repaint();
@@ -128,8 +129,7 @@ public void actionPerformed(ActionEvent buttonPress)
 		{
 			//what happens when button is pressed
 			System.out.println("Subtraction Selected");
-			calculator.doDifference();
-			JLabel label = new JLabel(Float.toString(ConsoleCalculator.answer));
+			JLabel label = new JLabel(" = " + calculator.doDifference());
 			calcBox.add(label);
 
 			//reloads the GUI
@@ -148,10 +148,9 @@ public void actionPerformed(ActionEvent buttonPress)
 		{
 			//what happens when button is pressed
 			System.out.println("Multiplication Selected");
-			calculator.doProduct();
 
 			//creates new text to display answer
-			JLabel label = new JLabel(Float.toString(ConsoleCalculator.answer));
+			JLabel label = new JLabel(" = " + calculator.doProduct());
 
 			//reloads the GUI
 			calcBox.add(label);
@@ -169,10 +168,10 @@ public void actionPerformed(ActionEvent buttonPress)
 		{
 			//what happens when button is pressed
 			System.out.println("Division Selected");
-			calculator.doQuotient();
+			
 
 			//creates new text to display answer
-			JLabel label = new JLabel(Float.toString(ConsoleCalculator.answer));
+			JLabel label = new JLabel(" = " + calculator.doQuotient());
 			calcBox.add(label);
 
 			//reloads the GUI