From c914fac1f582705c00d267142ab52b813946e249 Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@warp.ovh>
Date: Sun, 11 Mar 2018 17:47:42 +0100
Subject: [PATCH] Moved OutputLayout

---
 .classpath                                                  | 3 ++-
 .../gui/expression/containers/OutputContainer.java          | 1 +
 .../gui/expression/containers/OutputLayout.java             | 3 ---
 .../picalculator/gui/expression/layouts/OutputLayout.java   | 3 +++
 .../java/org/warp/picalculator/math/solver/MathSolver.java  | 6 +++---
 5 files changed, 9 insertions(+), 7 deletions(-)
 delete mode 100755 src/main/java/org/warp/picalculator/gui/expression/containers/OutputLayout.java
 create mode 100755 src/main/java/org/warp/picalculator/gui/expression/layouts/OutputLayout.java

diff --git a/.classpath b/.classpath
index a76db42c..6c802bcb 100644
--- a/.classpath
+++ b/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -20,6 +20,7 @@
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
diff --git a/src/main/java/org/warp/picalculator/gui/expression/containers/OutputContainer.java b/src/main/java/org/warp/picalculator/gui/expression/containers/OutputContainer.java
index 3c1b65d7..94cf7736 100755
--- a/src/main/java/org/warp/picalculator/gui/expression/containers/OutputContainer.java
+++ b/src/main/java/org/warp/picalculator/gui/expression/containers/OutputContainer.java
@@ -7,6 +7,7 @@ import org.warp.picalculator.gui.expression.Caret;
 import org.warp.picalculator.gui.expression.CaretState;
 import org.warp.picalculator.gui.expression.blocks.Block;
 import org.warp.picalculator.gui.expression.blocks.BlockContainer;
+import org.warp.picalculator.gui.expression.layouts.OutputLayout;
 import org.warp.picalculator.gui.graphicengine.GraphicEngine;
 import org.warp.picalculator.gui.graphicengine.Renderer;
 
diff --git a/src/main/java/org/warp/picalculator/gui/expression/containers/OutputLayout.java b/src/main/java/org/warp/picalculator/gui/expression/containers/OutputLayout.java
deleted file mode 100755
index daea265c..00000000
--- a/src/main/java/org/warp/picalculator/gui/expression/containers/OutputLayout.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package org.warp.picalculator.gui.expression.containers;
-
-public interface OutputLayout {}
diff --git a/src/main/java/org/warp/picalculator/gui/expression/layouts/OutputLayout.java b/src/main/java/org/warp/picalculator/gui/expression/layouts/OutputLayout.java
new file mode 100755
index 00000000..dd5867c7
--- /dev/null
+++ b/src/main/java/org/warp/picalculator/gui/expression/layouts/OutputLayout.java
@@ -0,0 +1,3 @@
+package org.warp.picalculator.gui.expression.layouts;
+
+public interface OutputLayout {}
diff --git a/src/main/java/org/warp/picalculator/math/solver/MathSolver.java b/src/main/java/org/warp/picalculator/math/solver/MathSolver.java
index 80fedb42..588fb3d1 100644
--- a/src/main/java/org/warp/picalculator/math/solver/MathSolver.java
+++ b/src/main/java/org/warp/picalculator/math/solver/MathSolver.java
@@ -44,12 +44,12 @@ public class MathSolver {
 			stepBefore = stepState;
 			ObjectArrayList<Function> stepResult = solveStep(lastFnc);
 			Utils.out.println(Utils.OUTPUTLEVEL_DEBUG_VERBOSE, "Step state: "+stepStates[stepState]+", Consecutive null steps: " + consecutiveNullSteps + ", currentStepStateN: " + currentStepStateN + ", result: ");
-			for (Function result : stepResult) {
-				Utils.out.println(Utils.OUTPUTLEVEL_DEBUG_VERBOSE, result.toString());
-			}
 			if (stepResult == null) {
 				currFnc = lastFnc;
 			} else {
+				for (Function result : stepResult) {
+					Utils.out.println(Utils.OUTPUTLEVEL_DEBUG_VERBOSE, result.toString());
+				}
 				currFnc = stepResult;
 				steps.add(currFnc);
 			}