oysteikt-skolearbeid/IT1901-individual
oysteikt-skolearbeid
/
IT1901-individual
1
0
Fork 0
Code Issues Pull Requests Activity

Fikset enda en feil

This commit is contained in:
Hallvard Traetteberg 2021-08-31 12:37:59 +02:00
parent 7358cb2de7
commit 66daa5dea2
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
javafx-template/src/main/java/app/Calc.java
View File

@ -89,8 +89,8 @@ public class Calc {
if (getOperandCount() < 2) { if (getOperandCount() < 2) {
throw new IllegalStateException("Too few operands (" + getOperandCount() + ") on the stack"); throw new IllegalStateException("Too few operands (" + getOperandCount() + ") on the stack");
} }
var op1 = popOperand();
var op2 = popOperand(); var op2 = popOperand();
var op1 = popOperand();
var result = op.apply(op1, op2); var result = op.apply(op1, op2);
pushOperand(result); pushOperand(result);
return result; return result;

2
modules-template/core/src/main/java/core/Calc.java
View File

@ -85,8 +85,8 @@ public class Calc {
if (getOperandCount() < 2) { if (getOperandCount() < 2) {
throw new IllegalStateException("Too few operands (" + getOperandCount() + ") on the stack"); throw new IllegalStateException("Too few operands (" + getOperandCount() + ") on the stack");
} }
var op1 = popOperand();
var op2 = popOperand(); var op2 = popOperand();
var op1 = popOperand();
var result = op.apply(op1, op2); var result = op.apply(op1, op2);
pushOperand(result); pushOperand(result);
return result; return result;

1
modules-template/ui/pom.xml
View File

@ -1,7 +1,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>it1901</groupId>
<artifactId>modules-ui</artifactId> <artifactId>modules-ui</artifactId>
<parent> <parent>

2
packages-template/src/main/java/core/Calc.java
View File

@ -85,8 +85,8 @@ public class Calc {
if (getOperandCount() < 2) { if (getOperandCount() < 2) {
throw new IllegalStateException("Too few operands (" + getOperandCount() + ") on the stack"); throw new IllegalStateException("Too few operands (" + getOperandCount() + ") on the stack");
} }
var op1 = popOperand();
var op2 = popOperand(); var op2 = popOperand();
var op1 = popOperand();
var result = op.apply(op1, op2); var result = op.apply(op1, op2);
pushOperand(result); pushOperand(result);
return result; return result;