From 66daa5dea20a581f444d59a8f1a71bd3309ee8e2 Mon Sep 17 00:00:00 2001
From: Hallvard Traetteberg <hal@ntnu.no>
Date: Tue, 31 Aug 2021 12:37:59 +0200
Subject: [PATCH] Fikset enda en feil
---
javafx-template/src/main/java/app/Calc.java | 2 +-
modules-template/core/src/main/java/core/Calc.java | 2 +-
modules-template/ui/pom.xml | 1 -
packages-template/src/main/java/core/Calc.java | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/javafx-template/src/main/java/app/Calc.java b/javafx-template/src/main/java/app/Calc.java
index 231878c..6c740f4 100644
--- a/javafx-template/src/main/java/app/Calc.java
+++ b/javafx-template/src/main/java/app/Calc.java
@@ -89,8 +89,8 @@ public class Calc {
if (getOperandCount() < 2) {
throw new IllegalStateException("Too few operands (" + getOperandCount() + ") on the stack");
}
- var op1 = popOperand();
var op2 = popOperand();
+ var op1 = popOperand();
var result = op.apply(op1, op2);
pushOperand(result);
return result;
diff --git a/modules-template/core/src/main/java/core/Calc.java b/modules-template/core/src/main/java/core/Calc.java
index 9b0f4c9..ed63b11 100644
--- a/modules-template/core/src/main/java/core/Calc.java
+++ b/modules-template/core/src/main/java/core/Calc.java
@@ -85,8 +85,8 @@ public class Calc {
if (getOperandCount() < 2) {
throw new IllegalStateException("Too few operands (" + getOperandCount() + ") on the stack");
}
- var op1 = popOperand();
var op2 = popOperand();
+ var op1 = popOperand();
var result = op.apply(op1, op2);
pushOperand(result);
return result;
diff --git a/modules-template/ui/pom.xml b/modules-template/ui/pom.xml
index 8bc1cfe..0660fec 100644
--- a/modules-template/ui/pom.xml
+++ b/modules-template/ui/pom.xml
@@ -1,7 +1,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>it1901</groupId>
<artifactId>modules-ui</artifactId>
<parent>
diff --git a/packages-template/src/main/java/core/Calc.java b/packages-template/src/main/java/core/Calc.java
index 9b0f4c9..ed63b11 100644
--- a/packages-template/src/main/java/core/Calc.java
+++ b/packages-template/src/main/java/core/Calc.java
@@ -85,8 +85,8 @@ public class Calc {
if (getOperandCount() < 2) {
throw new IllegalStateException("Too few operands (" + getOperandCount() + ") on the stack");
}
- var op1 = popOperand();
var op2 = popOperand();
+ var op1 = popOperand();
var result = op.apply(op1, op2);
pushOperand(result);
return result;
--
GitLab