Fix [ 2025173 ] WFActivity defined twice
This commit is contained in:
parent
aa37528819
commit
72a4d10175
|
@ -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();
|
||||
}
|
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in New Issue