From 736b3c4da058f7af4879cbb566926d1cc1916741 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sun, 5 Sep 2021 19:04:28 +0200 Subject: [PATCH] Reformat files to use 2 space indentation --- oysteikt-calc/pom.xml | 152 ++++++------- oysteikt-calc/src/main/java/app/App.java | 20 +- .../src/main/java/app/AppController.java | 204 +++++++++--------- oysteikt-calc/src/main/java/app/Calc.java | 189 ++++++++-------- oysteikt-calc/src/main/resources/app/App.fxml | 100 ++++----- oysteikt-calc/src/test/java/app/AppTest.java | 170 +++++++-------- oysteikt-calc/src/test/java/app/CalcTest.java | 183 ++++++++-------- 7 files changed, 504 insertions(+), 514 deletions(-) diff --git a/oysteikt-calc/pom.xml b/oysteikt-calc/pom.xml index 010f57c..66bb246 100644 --- a/oysteikt-calc/pom.xml +++ b/oysteikt-calc/pom.xml @@ -1,51 +1,51 @@ - 4.0.0 - it1901 - javafx-template - 0.0.1-SNAPSHOT + 4.0.0 + it1901 + javafx-template + 0.0.1-SNAPSHOT - - UTF-8 - 16 - 16 - + + UTF-8 + 16 + 16 + - + - - - org.openjfx - javafx-controls - 16 - - - org.openjfx - javafx-fxml - 16 - + + + org.openjfx + javafx-controls + 16 + + + org.openjfx + javafx-fxml + 16 + - - - org.junit.jupiter - junit-jupiter-api - 5.7.2 - test - - - org.junit.jupiter - junit-jupiter-engine - 5.7.2 - test - - - org.junit.jupiter - junit-jupiter-params - 5.7.2 - test - + + + org.junit.jupiter + junit-jupiter-api + 5.7.2 + test + + + org.junit.jupiter + junit-jupiter-engine + 5.7.2 + test + + + org.junit.jupiter + junit-jupiter-params + 5.7.2 + test + - + org.testfx testfx-core @@ -57,42 +57,42 @@ testfx-junit5 4.0.16-alpha test - - - org.hamcrest - hamcrest - 2.2 - test - + + + org.hamcrest + hamcrest + 2.2 + test + - + - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 16 - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M5 - + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 16 + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M5 + - - org.openjfx - javafx-maven-plugin - 0.0.6 - - - - app.App - - - - + + org.openjfx + javafx-maven-plugin + 0.0.6 + + + + app.App + + + + diff --git a/oysteikt-calc/src/main/java/app/App.java b/oysteikt-calc/src/main/java/app/App.java index b27d095..4d2dc02 100644 --- a/oysteikt-calc/src/main/java/app/App.java +++ b/oysteikt-calc/src/main/java/app/App.java @@ -13,15 +13,15 @@ import java.io.IOException; */ public class App extends Application { - @Override - public void start(Stage stage) throws IOException { - FXMLLoader fxmlLoader = new FXMLLoader(this.getClass().getResource("App.fxml")); - Parent parent = fxmlLoader.load(); - stage.setScene(new Scene(parent)); - stage.show(); - } + @Override + public void start(Stage stage) throws IOException { + FXMLLoader fxmlLoader = new FXMLLoader(this.getClass().getResource("App.fxml")); + Parent parent = fxmlLoader.load(); + stage.setScene(new Scene(parent)); + stage.show(); + } - public static void main(String[] args) { - launch(); - } + public static void main(String[] args) { + launch(); + } } \ No newline at end of file diff --git a/oysteikt-calc/src/main/java/app/AppController.java b/oysteikt-calc/src/main/java/app/AppController.java index d47da69..e72afad 100644 --- a/oysteikt-calc/src/main/java/app/AppController.java +++ b/oysteikt-calc/src/main/java/app/AppController.java @@ -12,122 +12,122 @@ import javafx.scene.control.ListView; public class AppController { - private Calc calc; + private Calc calc; - public AppController() { - calc = new Calc(0.0, 0.0, 0.0); + public AppController() { + calc = new Calc(0.0, 0.0, 0.0); + } + + public Calc getCalc() { + return calc; + } + + public void setCalc(Calc calc) { + this.calc = calc; + updateOperandsView(); + } + + @FXML + private ListView operandsView; + + @FXML + private Label operandView; + + @FXML + void initialize() { + updateOperandsView(); + } + + private void updateOperandsView() { + List operands = operandsView.getItems(); + operands.clear(); + int elementCount = Math.min(calc.getOperandCount(), 3); + for (int i = 0; i < elementCount; i++) { + operands.add(calc.peekOperand(elementCount - i - 1)); } + } - public Calc getCalc() { - return calc; + private String getOperandString() { + return operandView.getText(); + } + + private boolean hasOperand() { + return !getOperandString().isBlank(); + } + + private double getOperand() { + return Double.valueOf(operandView.getText()); + } + + private void setOperand(String operandString) { + operandView.setText(operandString); + } + + @FXML + void handleEnter() { + if (hasOperand()) { + calc.pushOperand(getOperand()); + } else { + calc.dup(); } + setOperand(""); + updateOperandsView(); + } - public void setCalc(Calc calc) { - this.calc = calc; - updateOperandsView(); + private void appendToOperand(String s) { + // TODO + } + + @FXML + void handleDigit(ActionEvent ae) { + if (ae.getSource()instanceof Labeled l) { + // TODO append button label to operand } + } - @FXML - private ListView operandsView; - - @FXML - private Label operandView; - - @FXML - void initialize() { - updateOperandsView(); + @FXML + void handlePoint() { + var operandString = getOperandString(); + if (operandString.contains(".")) { + // TODO remove characters after point + } else { + // TODO append point } + } - private void updateOperandsView() { - List operands = operandsView.getItems(); - operands.clear(); - int elementCount = Math.min(calc.getOperandCount(), 3); - for (int i = 0; i < elementCount; i++) { - operands.add(calc.peekOperand(elementCount - i - 1)); - } - } + @FXML + void handleClear() { + // TODO clear operand + } - private String getOperandString() { - return operandView.getText(); - } + @FXML + void handleSwap() { + // TODO clear operand + } - private boolean hasOperand() { - return ! getOperandString().isBlank(); - } + private void performOperation(UnaryOperator op) { + // TODO + } - private double getOperand() { - return Double.valueOf(operandView.getText()); - } - - private void setOperand(String operandString) { - operandView.setText(operandString); + private void performOperation(boolean swap, BinaryOperator op) { + if (hasOperand()) { + // TODO push operand first } + // TODO perform operation, but swap first if needed + } - @FXML - void handleEnter() { - if (hasOperand()) { - calc.pushOperand(getOperand()); - } else { - calc.dup(); - } - setOperand(""); - updateOperandsView(); - } + @FXML + void handleOpAdd() { + // TODO + } - private void appendToOperand(String s) { - // TODO - } + @FXML + void handleOpSub() { + // TODO + } - @FXML - void handleDigit(ActionEvent ae) { - if (ae.getSource() instanceof Labeled l) { - // TODO append button label to operand - } - } - - @FXML - void handlePoint() { - var operandString = getOperandString(); - if (operandString.contains(".")) { - // TODO remove characters after point - } else { - // TODO append point - } - } - - @FXML - void handleClear() { - // TODO clear operand - } - - @FXML - void handleSwap() { - // TODO clear operand - } - - private void performOperation(UnaryOperator op) { - // TODO - } - - private void performOperation(boolean swap, BinaryOperator op) { - if (hasOperand()) { - // TODO push operand first - } - // TODO perform operation, but swap first if needed - } - - @FXML - void handleOpAdd() { - // TODO - } - - @FXML - void handleOpSub() { - // TODO - } - - @FXML - void handleOpMult() { - // TODO - } + @FXML + void handleOpMult() { + // TODO + } } diff --git a/oysteikt-calc/src/main/java/app/Calc.java b/oysteikt-calc/src/main/java/app/Calc.java index 6c740f4..f769f6f 100644 --- a/oysteikt-calc/src/main/java/app/Calc.java +++ b/oysteikt-calc/src/main/java/app/Calc.java @@ -6,111 +6,112 @@ import java.util.function.BinaryOperator; import java.util.function.UnaryOperator; public class Calc { - - private final List operandStack; - public Calc(double... operands) { - operandStack = new ArrayList<>(operands.length + 2); - for (var d : operands) { - operandStack.add(d); - } - } + private final List operandStack; - /** - * @return the number of operands on the stack - */ - public int getOperandCount() { - return operandStack.size(); + public Calc(double... operands) { + operandStack = new ArrayList<>(operands.length + 2); + for (var d : operands) { + operandStack.add(d); } + } - /** - * Pushes a new operand onto top of the stack. - * - * @param d the new operand - */ - public void pushOperand(double d) { - operandStack.add(d); - } + /** + * @return the number of operands on the stack + */ + public int getOperandCount() { + return operandStack.size(); + } - /** - * @param n the place (from the top) to peek - * @return the n'th operand from the top - * @throws IllegalArgumentException if n is larger than the operand count - */ - public double peekOperand(int n) { - if (n >= getOperandCount()) { - throw new IllegalArgumentException("Cannot peek at position " + n + " when the operand count is " + getOperandCount()); - } - return operandStack.get(getOperandCount() - n - 1); - } + /** + * Pushes a new operand onto top of the stack. + * + * @param d the new operand + */ + public void pushOperand(double d) { + operandStack.add(d); + } - /** - * @return the top operand - */ - public double peekOperand() { - return peekOperand(0); + /** + * @param n the place (from the top) to peek + * @return the n'th operand from the top + * @throws IllegalArgumentException if n is larger than the operand count + */ + public double peekOperand(int n) { + if (n >= getOperandCount()) { + throw new IllegalArgumentException( + "Cannot peek at position " + n + " when the operand count is " + getOperandCount()); } + return operandStack.get(getOperandCount() - n - 1); + } - /** - * Removes and returns the top operand. - * - * @return the top operand - * @throws IllegalStateException if the stack is empty - */ - public double popOperand() { - if (getOperandCount() == 0) { - throw new IllegalStateException("Cannot pop from an empty stack"); - } - return operandStack.remove(operandStack.size() - 1); - } - - /** - * Performs the provided operation in the top operand, and - * replaces it with the result. - * - * @param op the operation to perform - * @return the result of performing the operation - * @throws IllegalStateException if the operand stack is empty - */ - public double performOperation(UnaryOperator op) throws IllegalStateException { - // TODO - return 0.0; - } + /** + * @return the top operand + */ + public double peekOperand() { + return peekOperand(0); + } - /** - * Performs the provided operation in the two topmost operands, and - * replaces them with the result. - * - * @param op the operation to perform - * @return the result of performing the operation - * @throws IllegalStateException if the operand count is less than two - */ - public double performOperation(BinaryOperator op) throws IllegalStateException { - if (getOperandCount() < 2) { - throw new IllegalStateException("Too few operands (" + getOperandCount() + ") on the stack"); - } - var op2 = popOperand(); - var op1 = popOperand(); - var result = op.apply(op1, op2); - pushOperand(result); - return result; + /** + * Removes and returns the top operand. + * + * @return the top operand + * @throws IllegalStateException if the stack is empty + */ + public double popOperand() { + if (getOperandCount() == 0) { + throw new IllegalStateException("Cannot pop from an empty stack"); } + return operandStack.remove(operandStack.size() - 1); + } - /** - * Swaps the two topmost operands. - * - * @throws IllegalStateException if the operand count is less than two - */ - public void swap() { - - } + /** + * Performs the provided operation in the top operand, and replaces it with the + * result. + * + * @param op the operation to perform + * @return the result of performing the operation + * @throws IllegalStateException if the operand stack is empty + */ + public double performOperation(UnaryOperator op) throws IllegalStateException { + // TODO + return 0.0; + } - /** - * Duplicates the top operand. - * - * @throws IllegalStateException if the operand stack is empty - */ - public void dup() { - // TODO + /** + * Performs the provided operation in the two topmost operands, and replaces + * them with the result. + * + * @param op the operation to perform + * @return the result of performing the operation + * @throws IllegalStateException if the operand count is less than two + */ + public double performOperation(BinaryOperator op) throws IllegalStateException { + if (getOperandCount() < 2) { + throw new IllegalStateException("Too few operands (" + getOperandCount() + ") on the stack"); } + var op2 = popOperand(); + var op1 = popOperand(); + var result = op.apply(op1, op2); + pushOperand(result); + return result; + } + + /** + * Swaps the two topmost operands. + * + * @throws IllegalStateException if the operand count is less than two + */ + public void swap() { + + } + + /** + * Duplicates the top operand. + * + * @throws IllegalStateException if the operand stack is empty + */ + public void dup() { + // TODO + } } \ No newline at end of file diff --git a/oysteikt-calc/src/main/resources/app/App.fxml b/oysteikt-calc/src/main/resources/app/App.fxml index 7356474..5e9e25f 100644 --- a/oysteikt-calc/src/main/resources/app/App.fxml +++ b/oysteikt-calc/src/main/resources/app/App.fxml @@ -6,59 +6,59 @@ + alignment="CENTER" hgap="10.0" vgap="10.0" > - -