Xmaslecturev2 simon schall

ProfCalculator/src/de/uulm/sp/swt/profcalculator/Logger.java

@@ -0,0 +1,23 @@
+package de.uulm.sp.swt.profcalculator;
+
+public class Logger {
+
+	public static final boolean LOGGING = true;
+
+	private static Logger logger = new Logger();
+
+	private Logger() {
+		log("Logging enabled");
+	}
+
+	public void log(String message) {
+		if (LOGGING) {
+			System.out.println(message);
+		}
+	}
+
+	public static Logger getLogger() {
+		return logger;
+	}
+
+}

ProfCalculator/src/de/uulm/sp/swt/profcalculator/ProfCalculator.java

@@ -1,5 +1,14 @@
 package de.uulm.sp.swt.profcalculator;
 
+import de.uulm.sp.swt.profcalculator.expressions.Addition;
+import de.uulm.sp.swt.profcalculator.expressions.Expression;
+import de.uulm.sp.swt.profcalculator.expressions.Multiplication;
+import de.uulm.sp.swt.profcalculator.expressions.NecessaryBrackets;
+import de.uulm.sp.swt.profcalculator.expressions.Value;
+import de.uulm.sp.swt.profcalculator.gui.BlueFontGUIFactory;
+import de.uulm.sp.swt.profcalculator.gui.GUIFactory;
+import de.uulm.sp.swt.profcalculator.gui.LargeFontGUIFactory;
+import de.uulm.sp.swt.profcalculator.gui.LargeRedFontGUIFactory;
 import javafx.application.Application;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
@@ -16,37 +25,48 @@ public class ProfCalculator	extends Application implements EventHandler<ActionEv
 
 	private final static Value DEFAULT_VALUE = new Value(0);
 
-	private Add addition = new Add(DEFAULT_VALUE, DEFAULT_VALUE);
+	private Expression expression = DEFAULT_VALUE;
+
+	private GUIFactory guiFactory = new LargeRedFontGUIFactory();
 
-	private Label errorLabel = new Label();
+	private Label errorLabel = guiFactory.createLabel();
 
-	private TextField inputField = new TextField();
+	private TextField inputField = guiFactory.createTextField();
 
-	private Button addButton = new Button("+");
+	private Button additionButton = guiFactory.createButton("+");
+	private Button multiplicationButton = guiFactory.createButton("*");
 
-	private Label resultLabel = new Label();
+	private Label resultLabel = guiFactory.createLabel();
 
 	@Override
 	public void start(Stage stage) throws Exception {
 		stage.setTitle("Professorial Calculator");
 		errorLabel.setTextFill(Color.web("#AA0000"));
 
-		VBox layout = new VBox(10, errorLabel, inputField, addButton, resultLabel);
+		VBox layout = new VBox(10, errorLabel, inputField, additionButton, multiplicationButton, resultLabel);
 		layout.setPadding(new Insets(20, 80, 20, 80));
 		Scene scene = new Scene(layout);
 
 		stage.setScene(scene);
 		stage.show();
-		addButton.setOnAction(this);
+		additionButton.setOnAction(this);
+		multiplicationButton.setOnAction(this);
 		updateGUI();
 	}
 
 	@Override
 	public void handle(ActionEvent event) {
 		try {
 			int newValue = Integer.parseInt(inputField.getText());
-			int oldResult = addition.evaluate();
-			addition = new Add(new Value(oldResult), new Value(newValue));
+			if (event.getSource() == additionButton) {
+				expression = new Addition(expression, new Value(newValue));
+				Logger.getLogger().log("+ " + newValue);
+			}
+			else if (event.getSource() == multiplicationButton) {
+				expression = new Multiplication(expression, new Value(newValue));
+				Logger.getLogger().log("* " + newValue);
+			}
+			expression = new NecessaryBrackets(expression);
 			updateGUI();
 			inputField.requestFocus();
 		} catch (NumberFormatException e) {
@@ -55,7 +75,7 @@ public void handle(ActionEvent event) {
 	}
 
 	private void updateGUI() {
-		resultLabel.setText(addition.computeEquation());
+		resultLabel.setText(expression.computeEquation());
 		inputField.setText("");
 		errorLabel.setText("");
 	}

ProfCalculator/src/de/uulm/sp/swt/profcalculator/expressions/Addition.java

@@ -0,0 +1,21 @@
+package de.uulm.sp.swt.profcalculator.expressions;
+
+public class Addition extends Expression {
+
+	public Expression left;
+	public Expression right;
+
+	public Addition(Expression left, Expression right) {
+		this.left = left;
+		this.right = right;
+	}
+
+	public String toString(Expression parent) {
+		return left.toString(this) + " + " + right.toString(this);
+	}
+
+	public int evaluate() {
+		return left.evaluate() + right.evaluate();
+	}
+
+}

ProfCalculator/src/de/uulm/sp/swt/profcalculator/expressions/Expression.java

@@ -0,0 +1,17 @@
+package de.uulm.sp.swt.profcalculator.expressions;
+
+public abstract class Expression {
+
+	public abstract int evaluate();
+
+	public abstract String toString(Expression parent);
+
+	public String toString() {
+		return toString(null);
+	}
+
+	public String computeEquation() {
+		return toString() + " = " + evaluate();
+	}
+
+}

ProfCalculator/src/de/uulm/sp/swt/profcalculator/expressions/Multiplication.java

@@ -0,0 +1,21 @@
+package de.uulm.sp.swt.profcalculator.expressions;
+
+public class Multiplication extends Expression {
+
+	public Expression left;
+	public Expression right;
+
+	public Multiplication(Expression left, Expression right) {
+		this.left = left;
+		this.right = right;
+	}
+
+	public String toString(Expression parent) {
+		return left.toString(this) + " * " + right.toString(this);
+	}
+
+	public int evaluate() {
+		return left.evaluate() * right.evaluate();
+	}
+
+}

ProfCalculator/src/de/uulm/sp/swt/profcalculator/expressions/NecessaryBrackets.java

@@ -0,0 +1,25 @@
+package de.uulm.sp.swt.profcalculator.expressions;
+
+public class NecessaryBrackets extends Expression {
+
+	private Expression expression;
+
+	public NecessaryBrackets(Expression expression) {
+		this.expression = expression;
+	}
+
+	@Override
+	public String toString(Expression parent) {
+		String childString = expression.toString(parent);
+		if (parent instanceof Multiplication && expression instanceof Addition) {
+			childString = "(" + childString + ")";
+		}
+		return childString;
+	}
+
+	@Override
+	public int evaluate() {
+		return expression.evaluate();
+	}
+
+}

ProfCalculator/src/de/uulm/sp/swt/profcalculator/expressions/Value.java

@@ -0,0 +1,20 @@
+package de.uulm.sp.swt.profcalculator.expressions;
+
+public class Value extends Expression {
+
+	Integer value;
+
+	public Value(int value) {
+		this.value = value;
+	}
+
+	public String toString(Expression parent) {
+		return value.toString();
+	}
+
+	@Override
+	public int evaluate() {
+		return value.intValue();
+	}
+
+}

ProfCalculator/src/de/uulm/sp/swt/profcalculator/gui/BlueFontGUIFactory.java

@@ -0,0 +1,34 @@
+package de.uulm.sp.swt.profcalculator.gui;
+
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.paint.Color;
+import javafx.scene.text.Font;
+
+public class BlueFontGUIFactory implements GUIFactory {
+
+	final static Color BLUE = Color.web("#0000AA");
+
+	@Override
+	public Label createLabel() {
+		Label label = new Label();
+		label.setTextFill(BLUE);
+		return label;
+	}
+
+	@Override
+	public Button createButton(String title) {
+		Button button = new Button(title);
+		button.setTextFill(BLUE);
+		return button;
+	}
+
+	@Override
+	public TextField createTextField() {
+		TextField tf = new TextField();
+		tf.setStyle("-fx-text-inner-color: blue;");
+		return tf;
+	}
+
+}

ProfCalculator/src/de/uulm/sp/swt/profcalculator/gui/GUIFactory.java

@@ -0,0 +1,15 @@
+package de.uulm.sp.swt.profcalculator.gui;
+
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+
+public interface GUIFactory {
+
+	Label createLabel();
+
+	Button createButton(String title);
+
+	TextField createTextField();
+
+}

ProfCalculator/src/de/uulm/sp/swt/profcalculator/gui/LargeFontGUIFactory.java

@@ -0,0 +1,33 @@
+package de.uulm.sp.swt.profcalculator.gui;
+
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.text.Font;
+
+public class LargeFontGUIFactory implements GUIFactory {
+
+	final static Font FONT = new Font("Arial", 24);
+
+	@Override
+	public Label createLabel() {
+		Label label = new Label();
+		label.setFont(FONT);
+		return label;
+	}
+
+	@Override
+	public Button createButton(String title) {
+		Button button = new Button(title);
+		button.setFont(FONT);
+		return button;
+	}
+
+	@Override
+	public TextField createTextField() {
+		TextField tf = new TextField();
+		tf.setFont(FONT);
+		return tf;
+	}
+
+}

ProfCalculator/src/de/uulm/sp/swt/profcalculator/gui/LargeRedFontGUIFactory.java

@@ -0,0 +1,38 @@
+package de.uulm.sp.swt.profcalculator.gui;
+
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.paint.Color;
+import javafx.scene.text.Font;
+
+public class LargeRedFontGUIFactory implements GUIFactory {
+
+	final static Font FONT = new Font("Arial", 24);
+	final static Color RED = Color.web("#FF0000");
+
+	@Override
+	public Label createLabel() {
+		Label label = new Label();
+		label.setTextFill(RED);
+		label.setFont(FONT);
+		return label;
+	}
+
+	@Override
+	public Button createButton(String title) {
+		Button button = new Button(title);
+		button.setTextFill(RED);
+		button.setFont(FONT);
+		return button;
+	}
+
+	@Override
+	public TextField createTextField() {
+		TextField tf = new TextField();
+		tf.setStyle("-fx-text-inner-color: red;");
+		tf.setFont(FONT);
+		return tf;
+	}
+
+}