From 1021067099085d6b8cd7384580ddc83cb696c1d4 Mon Sep 17 00:00:00 2001 From: Tim Nolle Date: Fri, 10 Sep 2021 16:22:20 +0200 Subject: [PATCH 1/4] updated gitignore to ignore the eclipse-files --- .gitignore | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/.gitignore b/.gitignore index a1c2a23..0b4f76c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +ProfCalculator/.classpath +.project # Compiled class file *.class @@ -21,3 +23,101 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* + + +# Created by https://www.toptal.com/developers/gitignore/api/java,eclipse +# Edit at https://www.toptal.com/developers/gitignore?templates=java,eclipse + +### Eclipse ### +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.recommenders + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# PyDev specific (Python IDE for Eclipse) +*.pydevproject + +# CDT-specific (C/C++ Development Tooling) +.cproject + +# CDT- autotools +.autotools + +# Java annotation processor (APT) +.factorypath + +# PDT-specific (PHP Development Tools) +.buildpath + +# sbteclipse plugin +.target + +# Tern plugin +.tern-project + +# TeXlipse plugin +.texlipse + +# STS (Spring Tool Suite) +.springBeans + +# Code Recommenders +.recommenders/ + +# Annotation Processing +.apt_generated/ +.apt_generated_test/ + +# Scala IDE specific (Scala & Java development for Eclipse) +.cache-main +.scala_dependencies +.worksheet + +# Uncomment this line if you wish to ignore the project description file. +# Typically, this file would be tracked if it contains build/dependency configurations: +#.project + +### Eclipse Patch ### +# Spring Boot Tooling +.sts4-cache/ + +### Java ### +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +# End of https://www.toptal.com/developers/gitignore/api/java,eclipse + From 2bd7552d16d02c1a909ad078006b2235b60e59fd Mon Sep 17 00:00:00 2001 From: Tim Nolle Date: Sat, 11 Sep 2021 15:56:40 +0200 Subject: [PATCH 2/4] unneccesary commit, but files dont get ignored despite in the gitignore --- .gitignore | 2 +- ProfCalculator/.classpath | 3 +-- ProfCalculator/.settings/org.eclipse.jdt.core.prefs | 9 +++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 0b4f76c..438d538 100644 --- a/.gitignore +++ b/.gitignore @@ -37,7 +37,7 @@ tmp/ *.swp *~.nib local.properties -.settings/ +.settings/* .loadpath .recommenders diff --git a/ProfCalculator/.classpath b/ProfCalculator/.classpath index 2b1ff5c..3c48f73 100644 --- a/ProfCalculator/.classpath +++ b/ProfCalculator/.classpath @@ -1,11 +1,10 @@ - + - diff --git a/ProfCalculator/.settings/org.eclipse.jdt.core.prefs b/ProfCalculator/.settings/org.eclipse.jdt.core.prefs index ef28d2b..cd8d089 100644 --- a/ProfCalculator/.settings/org.eclipse.jdt.core.prefs +++ b/ProfCalculator/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=13 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=13 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -10,5 +11,5 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=13 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=11 From 357e62b50306aeab3d6feacdc72d328ff59b2b5a Mon Sep 17 00:00:00 2001 From: Tim Nolle Date: Sat, 11 Sep 2021 15:57:24 +0200 Subject: [PATCH 3/4] added 2 new operators: Div and Sub. Changed Int to Double to be able to calculate the divisions correctly --- .../sp/swt/profcalculator/ProfCalculator.java | 20 ++++++++++++---- .../profcalculator/expressions/Addition.java | 2 +- .../swt/profcalculator/expressions/Div.java | 23 +++++++++++++++++++ .../expressions/Expression.java | 2 +- .../expressions/Multiplication.java | 2 +- .../expressions/NecessaryBrackets.java | 5 ++-- .../swt/profcalculator/expressions/Sub.java | 21 +++++++++++++++++ .../swt/profcalculator/expressions/Value.java | 8 +++---- 8 files changed, 70 insertions(+), 13 deletions(-) create mode 100644 ProfCalculator/src/de/uulm/sp/swt/profcalculator/expressions/Div.java create mode 100644 ProfCalculator/src/de/uulm/sp/swt/profcalculator/expressions/Sub.java diff --git a/ProfCalculator/src/de/uulm/sp/swt/profcalculator/ProfCalculator.java b/ProfCalculator/src/de/uulm/sp/swt/profcalculator/ProfCalculator.java index 51994b5..8b9ecf1 100644 --- a/ProfCalculator/src/de/uulm/sp/swt/profcalculator/ProfCalculator.java +++ b/ProfCalculator/src/de/uulm/sp/swt/profcalculator/ProfCalculator.java @@ -1,9 +1,11 @@ package de.uulm.sp.swt.profcalculator; import de.uulm.sp.swt.profcalculator.expressions.Addition; +import de.uulm.sp.swt.profcalculator.expressions.Div; 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.Sub; import de.uulm.sp.swt.profcalculator.expressions.Value; import javafx.application.Application; import javafx.event.ActionEvent; @@ -28,7 +30,9 @@ public class ProfCalculator extends Application implements EventHandler Date: Mon, 13 Sep 2021 15:48:30 +0200 Subject: [PATCH 4/4] implemented new Factory and added textField to every factory --- .../sp/swt/profcalculator/ProfCalculator.java | 12 ++-- .../gui/BlueFontGUIFactory.java | 17 +++++- .../sp/swt/profcalculator/gui/GUIFactory.java | 5 ++ .../gui/LargeFontGUIFactory.java | 14 +++++ .../gui/TerminalStyleFactory.java | 55 +++++++++++++++++++ 5 files changed, 96 insertions(+), 7 deletions(-) create mode 100644 ProfCalculator/src/de/uulm/sp/swt/profcalculator/gui/TerminalStyleFactory.java diff --git a/ProfCalculator/src/de/uulm/sp/swt/profcalculator/ProfCalculator.java b/ProfCalculator/src/de/uulm/sp/swt/profcalculator/ProfCalculator.java index 21bb357..d31428d 100644 --- a/ProfCalculator/src/de/uulm/sp/swt/profcalculator/ProfCalculator.java +++ b/ProfCalculator/src/de/uulm/sp/swt/profcalculator/ProfCalculator.java @@ -7,8 +7,7 @@ import de.uulm.sp.swt.profcalculator.expressions.NecessaryBrackets; import de.uulm.sp.swt.profcalculator.expressions.Sub; 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.*; import javafx.application.Application; import javafx.event.ActionEvent; import javafx.event.EventHandler; @@ -27,16 +26,16 @@ public class ProfCalculator extends Application implements EventHandler