From 5ed3b5c2bc17e5ce60848c396b076a083cbcd5dc Mon Sep 17 00:00:00 2001
From: bartlomiejgora <bartlomiej.gora@gmail.com>
Date: Fri, 8 Apr 2016 15:51:24 +0200
Subject: [PATCH] Got back to 1.6 and refactor. + merge with master conflicts

---
 pom.xml                                      | 10 +---------
 src/main/java/pl/bgora/rpn/Calculator.java   |  4 ++--
 src/main/java/pl/bgora/rpn/RPNChecking.java  |  8 ++------
 src/main/java/pl/bgora/rpn/RPNExecuting.java |  4 +---
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index a4736b0..7b96789 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>pl.bgora</groupId>
 	<artifactId>RPNLibrary</artifactId>
-	<version>2.0.1</version>
+	<version>3.0.0</version>
 	<name>RPNLibrary</name>
 	<description>RPN Libray for Java.</description>
 	<build>
@@ -20,14 +20,6 @@
 					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
-			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>
diff --git a/src/main/java/pl/bgora/rpn/Calculator.java b/src/main/java/pl/bgora/rpn/Calculator.java
index 13d4f78..2c80ba6 100644
--- a/src/main/java/pl/bgora/rpn/Calculator.java
+++ b/src/main/java/pl/bgora/rpn/Calculator.java
@@ -200,12 +200,12 @@ private String prepareInput(String input) throws WrongArgumentException {
             } else if (Character.isLetter(c)) {
                 lastWasDigit = false;
                 lastWasOperator = false;
-                lastWasWhiteSpace = false;
-                if (!lastWasLetter) {
+                if (!lastWasLetter && !lastWasWhiteSpace) {
                     result.append(" ").append(c);
                 } else {
                     result.append(c);
                 }
+                lastWasWhiteSpace = false;
                 lastWasLetter = true;
             } else {
                 throw new WrongArgumentException("Element \"" + c + "\" is not recognized by the Checker");
diff --git a/src/main/java/pl/bgora/rpn/RPNChecking.java b/src/main/java/pl/bgora/rpn/RPNChecking.java
index 7422128..7cbd447 100644
--- a/src/main/java/pl/bgora/rpn/RPNChecking.java
+++ b/src/main/java/pl/bgora/rpn/RPNChecking.java
@@ -37,11 +37,7 @@ public interface RPNChecking {
 
     int compareOperators(String c1, String c2);
 
-    default boolean isFunction(String input) {
-        return false;
-    }
+    boolean isFunction(String input);
 
-    default int getFunctionParamsCount(String functionName) {
-        return 0;
-    }
+    int getFunctionParamsCount(String functionName);
 }
diff --git a/src/main/java/pl/bgora/rpn/RPNExecuting.java b/src/main/java/pl/bgora/rpn/RPNExecuting.java
index d2d4851..f66eb9f 100644
--- a/src/main/java/pl/bgora/rpn/RPNExecuting.java
+++ b/src/main/java/pl/bgora/rpn/RPNExecuting.java
@@ -49,7 +49,5 @@ public interface RPNExecuting {
      * @return Calculation result as BigDecimal.
      * @throws NoSuchFunctionFound thrown if Executing object cannot find method.
      */
-    default BigDecimal executeFunction(String functionName, RoundingMode mode, String... arguments) throws NoSuchFunctionFound {
-        return null;
-    }
+     BigDecimal executeFunction(String functionName, RoundingMode mode, String... arguments) throws NoSuchFunctionFound;
 }