From 2bbff2bf5c63ee8806ede8ef239c1afd5d59a72a Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Sat, 1 Jun 2013 11:50:56 -0500
Subject: [PATCH] IDEMPIERE-993 Upgrade upload button on Image fields to zk6

---
 .../webui/factory/ButtonFactory.java          |  8 ++----
 .../webui/install/WTranslationDialog.java     |  3 ++-
 .../adempiere/webui/window/WImageDialog.java  | 27 +++++--------------
 3 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/ButtonFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/ButtonFactory.java
index e69db584f0..5d5e7a4976 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/ButtonFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/ButtonFactory.java
@@ -68,12 +68,8 @@ public class ButtonFactory {
     {
         Button button = new Button();
         button.setName("btn"+name);
-        
-        String text = Msg.translate(Env.getCtx(), name);
-        if (!name.equals(text))
-        	text = text.replaceAll("[&]", "");
-        else
-        	text = null;
+
+        String text = Util.cleanAmp(Msg.translate(Env.getCtx(), name));
 
         if (withText && text != null)
         {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/install/WTranslationDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/install/WTranslationDialog.java
index 02d314063e..3e078fd993 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/install/WTranslationDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/install/WTranslationDialog.java
@@ -26,6 +26,7 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
 import org.adempiere.exceptions.AdempiereException;
+import org.adempiere.webui.AdempiereWebUI;
 import org.adempiere.webui.LayoutUtils;
 import org.adempiere.webui.component.Button;
 import org.adempiere.webui.component.FolderBrowser;
@@ -128,7 +129,7 @@ public class WTranslationDialog extends TranslationController implements IFormCo
 		bImport.setLabel(Msg.getMsg(Env.getCtx(), "Import"));
 		bImport.addActionListener(this);		
 		bImportZIP.setLabel(Msg.getMsg(Env.getCtx(), "ImportZIP"));
-		bImportZIP.setUpload("true");
+		bImportZIP.setUpload(AdempiereWebUI.getUploadSetting());
 		bImportZIP.addEventListener(Events.ON_UPLOAD, this);
 
 		Rows rows = centerLayout.newRows();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java
index cfc401b4db..a1039b3c79 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java
@@ -38,11 +38,10 @@ import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zk.ui.event.UploadEvent;
 import org.zkoss.zul.Borderlayout;
 import org.zkoss.zul.Center;
-import org.zkoss.zul.North;
-import org.zkoss.zul.South;
-import org.zkoss.zul.Fileupload;
 import org.zkoss.zul.Image;
+import org.zkoss.zul.North;
 import org.zkoss.zul.Separator;
+import org.zkoss.zul.South;
 
 /**
  *  Base on the original Swing Image Dialog.
@@ -57,7 +56,7 @@ public class WImageDialog extends Window implements EventListener<Event>
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 4253571652070223072L;
+	private static final long serialVersionUID = -5048907034691374834L;
 
 	/**
 	 *  Constructor
@@ -147,9 +146,10 @@ public class WImageDialog extends Window implements EventListener<Event>
 		south.setStyle("background-color: transparent; border: none;");
 		south.setParent(mainLayout);
 		south.appendChild(confirmPanel);
-		
+
 		//
-		fileButton.addEventListener(Events.ON_CLICK, this);
+		fileButton.setUpload(AdempiereWebUI.getUploadSetting());
+		fileButton.addEventListener(Events.ON_UPLOAD, this);
 		confirmPanel.addActionListener(Events.ON_CLICK, this);
 		
 		addEventListener(Events.ON_UPLOAD, this);
@@ -161,10 +161,6 @@ public class WImageDialog extends Window implements EventListener<Event>
 			UploadEvent ue = (UploadEvent) e;
 			processUploadMedia(ue.getMedia());
 		}
-		else if (e.getTarget() == fileButton)
-		{
-			cmd_file();
-		}
 		else if (e.getTarget().getId().equals(ConfirmPanel.A_OK))
 		{
 			if (image.getContent() != null)
@@ -196,17 +192,6 @@ public class WImageDialog extends Window implements EventListener<Event>
 	public boolean isCancel() {
 		return cancel;
 	}
-	
-	/**
-	 *  Load file & display
-	 */
-	private void cmd_file()
-	{
-		//  Show File Open Dialog
-		Media media = Fileupload.get();
-		if (AdempiereWebUI.isEventThreadEnabled())
-			processUploadMedia(media);
-	}   //  cmd_file
 
 	private void processUploadMedia(Media imageFile) {
 		if (imageFile == null)