From 89723b37faa3994e9ed12c4a041fa55ad0f84288 Mon Sep 17 00:00:00 2001
From: Orange <raffy.m.96@gmail.com>
Date: Mon, 7 Nov 2016 18:31:04 +0100
Subject: [PATCH] Fix All

---
 src/FigureGeometriche/Manager.java | 39 ++++++++++++++++--------------
 src/FigureGeometriche/Test.java    |  3 +--
 src/FigureGeometriche/figure       |  8 +++---
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/FigureGeometriche/Manager.java b/src/FigureGeometriche/Manager.java
index 846b061..ffd6347 100644
--- a/src/FigureGeometriche/Manager.java
+++ b/src/FigureGeometriche/Manager.java
@@ -5,33 +5,36 @@ import java.util.Scanner;
 public class Manager{
 	public Manager(Scanner sc) throws Exception{
 		figure = new ArrayList<FiguraGeometrica>();
-		FiguraGeometrica fg;
-		String tipo=sc.next();
-		
-		do{
-			if(!sc.hasNext()) 
-				fg=null;
-			else{
-				tipo=sc.next();
-				if(tipo.equals("Regolare"))
-					fg=FiguraRegolare.read(sc);
-				else if(tipo.equals("Rettangolo"))
-					fg=Rettangolo.read(sc);
-				else
-					fg=Cerchio.read(sc);
+		FiguraGeometrica fg=read(sc);
+		while(fg!=null){
 			figure.add(fg);
-			}
-		}while(fg!=null);
+			fg=read(sc);
+		}
+	}
+
+	private static FiguraGeometrica read(Scanner sc)  throws Exception{
+		FiguraGeometrica fg;
+		String tipo;
+		if(!sc.hasNext()) return null;
+		tipo=sc.next();
+		if(tipo.equals("Regolare"))
+			fg=FiguraRegolare.read(sc);
+		else if(tipo.equals("Rettangolo"))
+			fg=Rettangolo.read(sc);
+		else
+			fg=Cerchio.read(sc);
+
+		return fg;
 	}
 	
-	public double getAreaMax() {
+	public FiguraGeometrica getAreaMax() {
 		FiguraGeometrica max = figure.get(0);
 
 		for (int i = 1; i < figure.size(); i++)
 			if (max.calcolaArea() < figure.get(i).calcolaArea())
 				max = figure.get(i);
 		
-		return max.calcolaArea();
+		return max;
 	}
 	
 	public void print(PrintStream ps){
diff --git a/src/FigureGeometriche/Test.java b/src/FigureGeometriche/Test.java
index d93c754..c49ae7a 100644
--- a/src/FigureGeometriche/Test.java
+++ b/src/FigureGeometriche/Test.java
@@ -6,7 +6,6 @@ public class Test {
 		Scanner sc = new Scanner(new File("figure"));
 		Manager manager = new Manager(sc);
 		
-		//manager.getAreaMax();
-		manager.print(System.out);
+		manager.getAreaMax().print(System.out);
 	}
 }
diff --git a/src/FigureGeometriche/figure b/src/FigureGeometriche/figure
index 4c178f0..cede462 100644
--- a/src/FigureGeometriche/figure
+++ b/src/FigureGeometriche/figure
@@ -1,6 +1,6 @@
 Cerchio 2
-Regolare 2 0.5 4
-Regolare 2 1.03 7
-Rettangolo 3 5
 Cerchio 3
-Regolare 2 2.35 15
\ No newline at end of file
+Regolare 2 1,03 7
+Rettangolo 3 5
+Regolare 2 0,5 4
+Regolare 2 2,35 15
\ No newline at end of file