From 7edd7f1bbbf3870ff22c40311a4169999782a248 Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@warp.ovh>
Date: Mon, 1 May 2017 21:24:30 +0200
Subject: [PATCH] Updated eclipse to maven

---
 .classpath                                    | 30 ++++++++++---------
 .project                                      |  6 ++++
 .settings/org.eclipse.core.resources.prefs    | 14 ++-------
 .settings/org.eclipse.jdt.core.prefs          |  4 +++
 .settings/org.eclipse.m2e.core.prefs          |  4 +++
 .../java/org/warp/picalculator/Utils.java     |  2 +-
 6 files changed, 34 insertions(+), 26 deletions(-)
 create mode 100644 .settings/org.eclipse.m2e.core.prefs

diff --git a/.classpath b/.classpath
index 02ce1485..bd8efbd4 100644
--- a/.classpath
+++ b/.classpath
@@ -1,29 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="org/warp/picalculator/deprecatedmath/|org/warp/picalculator/device/PIDisplay.java|org/warp/picalculator/device/graphicengine/Display.java|com/rits/cloning/|com/rits/perspectives/|com/rits/|com/|org/warp/picalculator/TestCalcBenchmark.java" kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="res"/>
-	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/JOGL"/>
-	<classpathentry kind="lib" path="libs/pi4j-1.1/pi4j-core.jar" sourcepath="libs/pi4j-1.1/pi4j-core-sources.jar">
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/PICalculator/libs/pi4j-1.1/pi4j-core-javadoc.jar!/"/>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="libs/pi4j-1.1/pi4j-device.jar" sourcepath="libs/pi4j-1.1/pi4j-device-sources.jar">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/PICalculator/libs/pi4j-1.1/pi4j-device-javadoc.jar!/"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="libs/pi4j-1.1/pi4j-gpio-extension.jar" sourcepath="libs/pi4j-1.1/pi4j-gpio-extension-sources.jar">
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/PICalculator/libs/pi4j-1.1/pi4j-gpio-extension-javadoc.jar!/"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="libs/pi4j-1.1/pi4j-service.jar" sourcepath="libs/pi4j-1.1/pi4j-service-sources.jar">
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/PICalculator/libs/pi4j-1.1/pi4j-service-javadoc.jar!/"/>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="libs/fastutil/fastutil-7.2.0.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/.project b/.project
index 85bd3d2b..fa195006 100644
--- a/.project
+++ b/.project
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 6ec08871..7d06bdbf 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,12 +1,4 @@
 eclipse.preferences.version=1
-encoding//src/org/nevec/rjm/BigSurd.java=UTF-8
-encoding//src/org/nevec/rjm/BigSurdVec.java=UTF-8
-encoding//src/org/warp/picalculator/Main.java=UTF-8
-encoding//src/org/warp/picalculator/gui/graphicengine/cpu/CPUEngine.java=UTF-8
-encoding//src/org/warp/picalculator/gui/screens/MathInputScreen.java=UTF-8
-encoding//src/org/warp/picalculator/math/MathematicalSymbols.java=UTF-8
-encoding//src/org/warp/picalculator/math/functions/Expression.java=UTF-8
-encoding//src/org/warp/picalculator/math/functions/Root.java=UTF-8
-encoding//src/org/warp/picalculator/math/functions/RootSquare.java=UTF-8
-encoding//src/org/warp/picalculator/math/functions/Sum.java=UTF-8
-encoding/<project>=UTF-8
+encoding//src/main/java=UTF-8
+encoding//src/main/java/org/warp/picalculator/gui/expression/blocks/BlockParenthesis.java=UTF-8
+encoding//src/main/java/org/warp/picalculator/math/MathematicalSymbols.java=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index a7aa567c..96cf561c 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,2 +1,6 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000..14b697b7
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/src/main/java/org/warp/picalculator/Utils.java b/src/main/java/org/warp/picalculator/Utils.java
index 3dfc1d03..fb46de08 100755
--- a/src/main/java/org/warp/picalculator/Utils.java
+++ b/src/main/java/org/warp/picalculator/Utils.java
@@ -49,7 +49,7 @@ public class Utils {
 
 	public static boolean debugOn;
 	public static boolean debugThirdScreen;
-	public static boolean debugWindow2x;
+	public static final boolean debugWindow2x = true;
 
 	public static final class DebugStream extends StringWriter {