package cal;

import java.util.Scanner;

/**
 * The Class Calculator.
 */
public class Calculator {
	private static InputHandler inputHandler;

	public static void main(String[] args) {
		// TODO Auto-generated method stub
		inputHandler = new InputHandler();
		scanInput();
	}

	public static void scanInput() {
		String s;
		Scanner in = new Scanner(System.in);
		System.out.print("Enter an expression: ");
		s = in.nextLine();
		if (inputHandler.setInput(s))
			System.out.println("Result:\n" + inputHandler.output());
		else
			System.out.println("Improper input format.");
	}

	public void setInputExpression(final String string) {
		// TODO Auto-generated method stub
		inputHandler  = new InputHandler();
		inputHandler.setInput(string);
	}

	public int execute() {
		// TODO Auto-generated method stub
		return Integer.parseInt(inputHandler.output());
	}

}

@@ -316,18 +316,23 @@
 String s
+ = %22%22
 ;%0A
-
 %09%09Scanne
@@ -362,16 +362,34 @@
 em.in);%0A
+%09%09while (true) %7B%0A%09
 %09%09System
@@ -409,28 +409,15 @@
 nter
- an expression
 : %22);%0A
+%09
 %09%09s 
@@ -433,16 +433,66 @@
 Line();%0A
+%09%09%09if(s.toLowerCase().equals(%22quit%22))%0A%09%09%09%09break;%0A%09
 %09%09if (in
@@ -515,16 +515,17 @@
 put(s))%0A
+%09
 %09%09%09Syste
@@ -576,16 +576,17 @@
 put());%0A
+%09
 %09%09else%0A%09
@@ -583,24 +583,25 @@
 %0A%09%09%09else%0A%09%09%09
+%09
 System.out.p
@@ -634,16 +634,75 @@
 mat.%22);%0A
+%09%09%09System.out.println();%0A%09%09%7D%0A%09%09System.out.println(%22Bye!%22);%0A
 %09%7D%0A%0A%09pub
@@ -781,32 +781,32 @@
 ted method stub%0A
+
 %09%09inputHandler  
@@ -804,17 +804,16 @@
 Handler 
- 
 = new In

Add loop for inputting