From 624d540308345f9b858fc50a504908c7173608bc Mon Sep 17 00:00:00 2001
From: Pedro Rolon <prolon@roshka.com>
Date: Wed, 28 Nov 2018 15:52:36 -0300
Subject: [PATCH] Se agregó código para ordenar las cartas del ejercicio 3

---
 jweb-e002/build/classes/.gitignore             |  2 ++
 jweb-e002/build/classes/servlets/ManoDoc.class | Bin 4840 -> 0 bytes
 jweb-e002/src/servlets/ManoDoc.java            | 32 +++++++++++++++++++++++++++++++-
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 jweb-e002/build/classes/.gitignore

diff --git a/jweb-e002/build/classes/.gitignore b/jweb-e002/build/classes/.gitignore
new file mode 100644
index 0000000..16d62d6
--- /dev/null
+++ b/jweb-e002/build/classes/.gitignore
@@ -0,0 +1,2 @@
+/clases/
+/servlets/
diff --git a/jweb-e002/build/classes/servlets/ManoDoc.class b/jweb-e002/build/classes/servlets/ManoDoc.class
index a8f5e17..bb2a574 100644
Binary files a/jweb-e002/build/classes/servlets/ManoDoc.class and b/jweb-e002/build/classes/servlets/ManoDoc.class differ
diff --git a/jweb-e002/src/servlets/ManoDoc.java b/jweb-e002/src/servlets/ManoDoc.java
index d51e97d..997cef4 100644
--- a/jweb-e002/src/servlets/ManoDoc.java
+++ b/jweb-e002/src/servlets/ManoDoc.java
@@ -6,6 +6,8 @@ import java.io.InputStreamReader;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Collections;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
@@ -56,9 +58,37 @@ public class ManoDoc extends HttpServlet {
 		System.out.println(nombreJugada);
 		System.out.println("************************");
 		
+		ArrayList<String> manoString = new ArrayList<String>();
+		
+		for(int i=0; i<mano.length;i++) {
+			if(mano[i].valor.equals("A")) {
+				mano[i].valor = "R";
+			}
+			else if(mano[i].valor.equals("T")){
+				mano[i].valor = "10";
+			}
+			manoString.add(mano[i].valor+mano[i].palo);
+		}
+		
+		Collections.sort(manoString);
+		
+		for(int i=0; i<mano.length; i++) {
+			if(manoString.get(i).charAt(0)=='R') {				
+				mano[i] = new Carta("A"+manoString.get(i).charAt(1));
+			}
+			else if(manoString.get(i).charAt(0)=='1' && manoString.get(i).charAt(1)=='0'){
+				mano[i] = new Carta("T"+manoString.get(i).charAt(2));
+			}
+			else {
+				mano[i] = new Carta(manoString.get(i));
+			}
+		}
+		
 		request.setAttribute("mano", mano);
 		request.setAttribute("nombreJugada", nombreJugada);
 		
+		
+		
 		RequestDispatcher rd = getServletContext().getRequestDispatcher("/WEB-INF/jsp/mano_doc.jsp");
 		rd.forward(request, response);
 	}
@@ -72,7 +102,7 @@ public class ManoDoc extends HttpServlet {
 	
 	public static String obtenerJson(String myURL) {
 		System.setProperty("http.agent", "Chrome");
-		System.out.println("Requeted URL:" + myURL);
+		System.out.println("Requested URL:" + myURL);
 		StringBuilder sb = new StringBuilder();
 		URLConnection urlConn = null;
 		InputStreamReader in = null;
--
libgit2 0.26.0