From c0f5a11fc8489fce68af97d3a1979b4f14385e90 Mon Sep 17 00:00:00 2001
From: Saku Ruohola <saku.ruohola@gmail.com>
Date: Mon, 1 Oct 2018 18:12:28 +0300
Subject: [PATCH] Assignment Finished

---
 bin/StringCalculator.class         | Bin 405 -> 1514 bytes
 src/StringCalculator.java          |  51 +++++++++++++++++++++++++++--
 src/StringCalculatorException.java |   2 +-
 3 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class
index a937b0c43633d36f133837cd90ddd10fb14ac782..ddf6e4bb82f9dca522c04c4a7315365051f876cb 100644
GIT binary patch
literal 1514
zcmZvcOK%cU6vzJ;28Iq(TcDuWN`03CrC95e)>o~Dq_&Hi8f{FR(y@-xfeeGu#HC-t
z$3{19T<AuOn!5K3_$~YZ#;E^0L(o1J+{d}+p7Z;kdxmenKWzY*#AOu$f&N9;vFx=O
zqgHLz47cv6P-wkxJT%5@hP^hvuyWt5x&q-T%eLHe0>SL)l7KQ(Uo|xZ(W4`Tut49O
zWt;P@^%c{(ZmiTyf%sg#YSfkt$CCSwQE~5CO?kF8Z<&#e)m4FHcJ5zx->W=Y5zuBI
zRn3NL)$OK=xIlVqgzmY90i;wUH|g-bb?n9-0o7{Gt~cDro|;=41or9}#1OMI8#T+V
z*o_u7r*=YFu1Nokj$!N<h`MIeUAVhs)LN9RWGkZ#7efyt*<LZ4Of2<o)5P4(*1CY8
zwy5uW(Qyni1(s<NmO$^KYg8XxGa6p;RE$JW5C|<7o@lqF$fAyMlxXpw1x9w{-JV(s
zn9y+?lLERgV9vDH+<Q{;@^*iz=_F38I3*DKC!}J#=9=l~ID<ZcNW*ZNCT#+{I?}J#
z7iBeB?~Xwru|s$jQ!JO{@E?hFlpEII7PUR}ORFu`TTa!yV#(G@ZhiZrq{0E}3bMJu
zmgG%@IjY=^a~9H?Ya{ZWivTo^@>s5;9ChD;b1!$4fIgn|bFFX}^TK>*@DMFmgVW(J
z+I;>463<c2<=aTl2Tv+*kR3}Z#TQ8B<lM%-8$)t&XZj7IpAoy+#(}R-6_HfNHeUVt
zKJ=EMf*wfGL*Vy_2%$70=tyu(6JtL?MhQ|PM47f(q&)9QAEg6KC>+Egq6X-37)LmV
zaS=x`!W=19AWNIVNMNkcZ={8aoJgyIpY#jJ-sfFet9SI0B1@jcI7N<K%N5!<_6!+M
zWQ>{$NoC?APAqt83RLrB>|Iw)#)~t^I71}eM<p35875T*MKa2A`}CzQeF<kh`Y0*O
zm?Dva0&n>Adp6MrNv~pB^7s1mY~&7oi#KHl4CFUnU{`)4{2CF3^$!K7|EqVL(ZQHe
z)}t3W#F6)?a-MylOErLVWZ`$nnCEeUvE%&tD_KdtSpP2wS#<sxaNOK4E-ex!G5FG_
t=yt(2mJ%}`<4a8Nm5=|&lIXG|_?kz^67I6ZwzBm6f+`#R5_1MH^B3Q)4X^+J

delta 104
zcmaFGJ(Zd3)W2Q(7#J8#7(^y=ZJ3<Js5p5ClO7|}<mXH-?u-oVKq)f@Mg}Gz&BVM0
nL^5yzNj9Ju15lP5NQyyZ8F(0Yfjp230R};!JR^e;m?sPXA_5Gh

diff --git a/src/StringCalculator.java b/src/StringCalculator.java
index 487916b..364b0ca 100644
--- a/src/StringCalculator.java
+++ b/src/StringCalculator.java
@@ -1,9 +1,54 @@
 
 public class StringCalculator {
-	public int add(String numbersStr) {
+	
+	
+	public int add(String numbersStr) throws StringCalculatorException  {
 		// Returns the sum of the numbers given in numbersStr
+		int sum = 0;
+		int[] numberArray = new int[3];
 		
-		// not yet implemented
-		return 0;
+		if(!numbersStr.isEmpty()) {
+			
+			numberArray = splitInput(numbersStr);
+			for(int i = 0; i < numberArray.length; i++) {
+				if(numberArray[i] >= 0) {
+					testOfValue(numberArray[i]);
+					sum += numberArray[i];
+				} else throw new StringCalculatorException();
+			}
+		}
+		
+
+		return sum;
+	}
+	
+	private int[] splitInput(String numbersToSplit) {
+		String [] numbers;
+		int[] sum = new int[3];
+		numbers = numbersToSplit.split("[,|\n]");
+		if(testOfLength(numbers))		{
+			for(int i = 0; i < numbers.length; i++) {				
+					sum[i] = Integer.parseInt(numbers[i]);				
+			}
+		}
+		
+		return sum; 
 	}
+	
+	private boolean testOfLength(String[] testString) {
+		boolean test;
+		if(testString.length >= 0 && testString.length < 3) {
+			test = true;
+		} else test = false;
+		return test;
+	}
+	
+	private boolean testOfValue(int value) throws StringCalculatorException {
+		boolean test;
+		if(value < 0) {
+			 test = true;
+		} else throw new StringCalculatorException();
+		return test;
+	}
+
 }
diff --git a/src/StringCalculatorException.java b/src/StringCalculatorException.java
index da71147..9f37ce4 100644
--- a/src/StringCalculatorException.java
+++ b/src/StringCalculatorException.java
@@ -1,4 +1,4 @@
 
 public class StringCalculatorException extends Exception {
-
+// I expect that this doesn't need to edited as there was only talk of throwing it
 }