From 58d491495e50484ff750246f6777f3a899268567 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 29 May 2013 09:52:23 -0500 Subject: [PATCH] Backed out changeset 15f628d57e5c - committed modified FDialog by mistake --- .../org/adempiere/webui/window/FDialog.java | 45 +++---------------- 1 file changed, 6 insertions(+), 39 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FDialog.java index ea272aecdd..ed49be70a5 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FDialog.java @@ -199,26 +199,20 @@ public class FDialog error(windowNo, null, adMessage, msg); } - public static void error(int windowNo, Component comp, String adMessage, String message) - { - error(windowNo, comp, adMessage, message, null); - } - - /** + /** * Display error with error icon. * * @param windowNo Number of Window * @param comp Component (unused) * @param adMessage Message to be translated * @param message Additional message - * @param title If none then one will be generated * * @see #error(int, String) * @see #error(int, Component, String) * @see #error(int, String, String) */ - public static void error(int windowNo, Component comp, String adMessage, String message, String title) + public static void error(int windowNo, Component comp, String adMessage, String message) { Properties ctx = Env.getCtx(); StringBuffer out = new StringBuffer(); @@ -232,19 +226,8 @@ public class FDialog out = constructMessage(adMessage, message); - String newTitle; - - if (title == null) - { - newTitle = AEnv.getDialogHeader(ctx, windowNo); - } - else - { - newTitle = title; - } - String s = out.toString().replace("\n", "
"); - Messagebox.showDialog(s, newTitle, Messagebox.OK, Messagebox.ERROR); + Messagebox.showDialog(s, AEnv.getDialogHeader(ctx, windowNo), Messagebox.OK, Messagebox.ERROR); return; } @@ -347,11 +330,7 @@ public class FDialog return; } - public static void info(int windowNo, Component comp, String adMessage, String message) - { - info(windowNo, comp, adMessage, message, null); - } - + /** * Display information with information icon. * @@ -359,12 +338,11 @@ public class FDialog * @param comp Component (unused) * @param adMessage Message to be translated * @param message Additional message - * @param title If none then one will be generated * * @see #info(int, Component, String) */ - public static void info(int windowNo, Component comp, String adMessage, String message, String title) + public static void info(int windowNo, Component comp, String adMessage, String message) { Properties ctx = Env.getCtx(); @@ -379,19 +357,8 @@ public class FDialog out = constructMessage(adMessage, message); - String newTitle; - - if (title == null) - { - newTitle = AEnv.getDialogHeader(ctx, windowNo); - } - else - { - newTitle = title; - } - String s = out.toString().replace("\n", "
"); - Messagebox.showDialog(s, newTitle, Messagebox.OK, Messagebox.INFORMATION); + Messagebox.showDialog(s, AEnv.getDialogHeader(ctx, windowNo), Messagebox.OK, Messagebox.INFORMATION); return; }