From 72a4d10175d219fbfac5a03374f90824b14a3a70 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 25 Jul 2008 03:32:21 +0000 Subject: [PATCH] Fix [ 2025173 ] WFActivity defined twice --- .../webui/apps/wf/WWFActivity.java} | 8 ++++---- zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADForm.java | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) rename zkwebui/WEB-INF/src/org/{compiere/apps/wf/WFActivity.java => adempiere/webui/apps/wf/WWFActivity.java} (95%) diff --git a/zkwebui/WEB-INF/src/org/compiere/apps/wf/WFActivity.java b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java similarity index 95% rename from zkwebui/WEB-INF/src/org/compiere/apps/wf/WFActivity.java rename to zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java index f0c344b70c..bf1fad6596 100644 --- a/zkwebui/WEB-INF/src/org/compiere/apps/wf/WFActivity.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java @@ -1,4 +1,4 @@ -package org.compiere.apps.wf; +package org.adempiere.webui.apps.wf; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -43,7 +43,7 @@ import org.zkoss.zkex.zul.South; import org.zkoss.zul.Div; import org.zkoss.zul.Hbox; -public class WFActivity extends ADForm implements EventListener +public class WWFActivity extends ADForm implements EventListener { private static final long serialVersionUID = 1L; @@ -62,7 +62,7 @@ public class WFActivity extends ADForm implements EventListener /** Set Column */ private MColumn m_column = null; /** Logger */ - private static CLogger log = CLogger.getCLogger(WFActivity.class); + private static CLogger log = CLogger.getCLogger(WWFActivity.class); // // private Panel centerPanel = new Panel(); @@ -91,7 +91,7 @@ public class WFActivity extends ADForm implements EventListener private Label lOptional = new Label("(" + Msg.translate(Env.getCtx(), "Optional") + ")"); private WStatusBar statusBar = new WStatusBar(); - public WFActivity() + public WWFActivity() { super(); } diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADForm.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADForm.java index 639d1d9912..d14cc8cf81 100755 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADForm.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADForm.java @@ -31,7 +31,7 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; /** - * Adempeire Web UI custom form. + * Adempiere Web UI custom form. * The form is abstract, so specific types of custom form must be implemented * * @author Andrew Kimball @@ -189,6 +189,8 @@ public abstract class ADForm extends Window implements EventListener if ("org.compiere.apps.form.ArchiveViewer".equals(richClassName)) webClassName = "org.adempiere.webui.apps.form.WArchiveViewer"; // TEMP + else if ("org.compiere.apps.wf.WFActivity".equals(richClassName)) + webClassName = "org.adempiere.webui.apps.wf.WWFActivity"; // TEMP else webClassName = translateFormClassName(richClassName);