From 161a1ee699a3db6e48e02b622627c30ee18dc1bf Mon Sep 17 00:00:00 2001
From: thiago <thiago@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 14 Sep 2015 18:25:14 +0000
Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#6612=20-=20Corre=C3=A7=C3=A3o=20?=
 =?UTF-8?q?em=20tela=20de=20cadastro=20de=20bairro:=20Pesquisa=20e=20persi?=
 =?UTF-8?q?st=C3=AAncia=20de=20cidade=20estava=20com=20erro.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@47841 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../catalogos/EditarColoniaController.java     | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarColoniaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarColoniaController.java
index 66f178143..d5b227b71 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarColoniaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarColoniaController.java
@@ -15,6 +15,7 @@ import org.zkoss.util.resource.Labels;
 import org.zkoss.zhtml.Messagebox;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
+import org.zkoss.zk.ui.WrongValueException;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zul.Button;
 import org.zkoss.zul.Combobox;
@@ -38,7 +39,11 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox;
 @Scope("prototype")
 public class EditarColoniaController extends MyGenericForwardComposer {
 
-    @Autowired
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	@Autowired
     private ColoniaService coloniaService;
     private Colonia colonia;
     private MyListbox coloniaList;
@@ -115,10 +120,11 @@ public class EditarColoniaController extends MyGenericForwardComposer {
         txtNome.focus();
     }
 
-    public void onClick$btnSalvar(Event ev) throws InterruptedException {
+    @SuppressWarnings("deprecation")
+	public void onClick$btnSalvar(Event ev) throws InterruptedException {
         txtNome.getValue();
-        cmbCiudad.getValue();
         codpostal.getValue();
+        cmbCiudad.getValue();
         try {
             colonia.setActivo(Boolean.TRUE);
             colonia.setFecmodif(Calendar.getInstance().getTime());
@@ -154,6 +160,7 @@ public class EditarColoniaController extends MyGenericForwardComposer {
                     }
                 }
             }
+            cmbCiudad.getValue(colonia.getColoniaId() == null);
             if (podeSalvar) {
                 if (colonia.getColoniaId() == null) {
                     coloniaService.suscribir(colonia);
@@ -175,7 +182,10 @@ public class EditarColoniaController extends MyGenericForwardComposer {
                         Labels.getLabel("editarColoniaController.window.title"),
                         Messagebox.OK, Messagebox.EXCLAMATION);
             }
-        } catch (Exception ex) {
+        }catch(WrongValueException e){
+        	throw e;
+        }
+        catch (Exception ex) {
             log.error("editarColoniaController: " + ex);
             Messagebox.show(
                     Labels.getLabel("MSG.Error"),