From edd1a6f2bd706cb3c92450b66a8f390d7c30f98a Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Tue, 28 Feb 2012 01:08:14 +0800 Subject: [PATCH] IDEMPIERE-142 Upgrade web client to Zk 6.0 CE --- .hgignore | 8 +- org.adempiere.ui.zk/META-INF/MANIFEST.MF | 2 +- .../org/adempiere/webui/AdempiereWebUI.java | 15 +- .../src/org/adempiere/webui/ClientInfo.java | 8 +- .../src/org/adempiere/webui/LayoutUtils.java | 2 +- .../src/org/adempiere/webui/WLogin.java | 12 +- .../org/adempiere/webui/acct/WAcctViewer.java | 8 +- .../adempiere/webui/apps/ProcessDialog.java | 8 +- .../webui/apps/ProcessModalDialog.java | 2 +- .../webui/apps/form/WAllocation.java | 8 +- .../adempiere/webui/apps/form/WCharge.java | 8 +- .../webui/apps/form/WCreateFromInvoiceUI.java | 4 +- .../webui/apps/form/WCreateFromRMAUI.java | 4 +- .../apps/form/WCreateFromShipmentUI.java | 4 +- .../apps/form/WCreateFromStatementUI.java | 4 +- .../webui/apps/form/WCreateFromWindow.java | 8 +- .../webui/apps/form/WFileImport.java | 17 +- .../adempiere/webui/apps/form/WGenForm.java | 18 +- .../org/adempiere/webui/apps/form/WMatch.java | 8 +- .../org/adempiere/webui/apps/form/WMerge.java | 8 +- .../adempiere/webui/apps/form/WPayPrint.java | 6 +- .../adempiere/webui/apps/form/WPaySelect.java | 14 +- .../adempiere/webui/apps/form/WPayment.java | 8 +- .../webui/apps/form/WTreeMaintenance.java | 24 +- .../webui/apps/form/WTrxMaterial.java | 8 +- .../adempiere/webui/apps/graph/WGraph.java | 6 +- .../org/adempiere/webui/apps/wf/WFEditor.java | 10 +- .../org/adempiere/webui/apps/wf/WFPanel.java | 6 +- .../adempiere/webui/apps/wf/WWFActivity.java | 14 +- .../webui/component/ADTabListModel.java | 3 +- .../webui/component/ADTreeOnDropListener.java | 28 +- .../adempiere/webui/component/Accordion.java | 8 +- .../webui/component/Borderlayout.java | 12 +- .../adempiere/webui/component/Combobox.java | 3 + .../webui/component/DrillCommand.java | 23 +- .../webui/component/FolderBrowser.java | 8 +- .../adempiere/webui/component/GridPanel.java | 6 +- .../component/GridTabListItemRenderer.java | 3 +- .../webui/component/GridTabRowRenderer.java | 3 +- .../webui/component/GridTableListModel.java | 5 + .../adempiere/webui/component/ListPanel.java | 6 +- .../adempiere/webui/component/Listbox.java | 12 +- .../adempiere/webui/component/NumberBox.java | 42 +- .../webui/component/SimpleListModel.java | 3 +- .../webui/component/SimpleTreeModel.java | 65 +- .../webui/component/TokenCommand.java | 24 +- .../webui/component/WListItemRenderer.java | 7 +- .../webui/component/ZoomCommand.java | 20 +- .../webui/desktop/AbstractDesktop.java | 13 +- .../webui/desktop/DefaultDesktop.java | 18 +- .../webui/desktop/NavBar2Desktop.java | 18 +- .../webui/desktop/NavBarDesktop.java | 18 +- .../webui/editor/WAccountEditor.java | 2 +- .../adempiere/webui/editor/WDateEditor.java | 2 +- .../webui/editor/WDatetimeEditor.java | 2 +- .../webui/editor/WFilenameEditor.java | 12 +- .../webui/editor/WLocationEditor.java | 2 +- .../webui/editor/WLocatorEditor.java | 2 +- .../adempiere/webui/editor/WNumberEditor.java | 2 +- .../webui/editor/WPAttributeEditor.java | 2 +- .../adempiere/webui/editor/WSearchEditor.java | 2 +- .../adempiere/webui/editor/WStringEditor.java | 2 +- .../webui/editor/WTableDirEditor.java | 2 +- .../adempiere/webui/editor/WTimeEditor.java | 2 +- .../adempiere/webui/editor/WUrlEditor.java | 2 +- .../adempiere/webui/editor/WYesNoEditor.java | 2 +- .../org/adempiere/webui/event/ZoomEvent.java | 2 +- .../webui/install/WTranslationDialog.java | 6 +- .../org/adempiere/webui/panel/ADTabpanel.java | 30 +- .../adempiere/webui/panel/ADWindowPanel.java | 12 +- .../webui/panel/AbstractADWindowPanel.java | 12 +- .../adempiere/webui/panel/HeaderPanel.java | 6 +- .../adempiere/webui/panel/InfoAssetPanel.java | 8 +- .../webui/panel/InfoAssignmentPanel.java | 8 +- .../webui/panel/InfoBPartnerPanel.java | 8 +- .../webui/panel/InfoCashLinePanel.java | 8 +- .../webui/panel/InfoGeneralPanel.java | 8 +- .../adempiere/webui/panel/InfoInOutPanel.java | 8 +- .../webui/panel/InfoInvoicePanel.java | 8 +- .../adempiere/webui/panel/InfoOrderPanel.java | 8 +- .../panel/InfoPAttributeInstancePanel.java | 8 +- .../org/adempiere/webui/panel/InfoPanel.java | 6 + .../webui/panel/InfoPaymentPanel.java | 8 +- .../webui/panel/InfoProductPanel.java | 10 +- .../adempiere/webui/panel/InvoiceHistory.java | 8 +- .../org/adempiere/webui/panel/LoginPanel.java | 3 +- .../webui/panel/TreeSearchPanel.java | 18 +- .../adempiere/webui/panel/WAttachment.java | 35 +- .../org/adempiere/webui/panel/WSchedule.java | 2 - .../adempiere/webui/part/WindowContainer.java | 4 +- .../adempiere/webui/process/InvoicePrint.java | 4 +- .../adempiere/webui/util/TreeNodeAction.java | 4 +- .../org/adempiere/webui/util/TreeUtils.java | 6 +- .../adempiere/webui/window/FindWindow.java | 8 +- .../webui/window/WAccountDialog.java | 8 +- .../webui/window/WAssignmentDialog.java | 3 +- .../src/org/adempiere/webui/window/WChat.java | 6 +- .../adempiere/webui/window/WEMailDialog.java | 6 +- .../webui/window/WFieldRecordInfo.java | 6 +- .../adempiere/webui/window/WImageDialog.java | 22 +- .../adempiere/webui/window/WMediaDialog.java | 23 +- .../webui/window/WPAttributeDialog.java | 6 +- .../webui/window/WPAttributeInstance.java | 8 +- .../adempiere/webui/window/WRecordInfo.java | 8 +- .../src/org/adempiere/webui/window/WTask.java | 6 +- .../webui/window/WTextEditorDialog.java | 6 +- .../adempiere/webui/window/ZkJRViewer.java | 6 +- .../webui/window/ZkReportViewer.java | 6 +- .../zkmax/zul/render/Combobox2Default.java | 91 --- .../WEB-INF/tld/web/core.dsp.tld | 194 +++++- .../WEB-INF/tld/zk/core.dsp.tld | 210 +------ .../WEB-INF/tld/zul/core.dsp.tld | 114 ---- org.adempiere.ui.zk/WEB-INF/xsd/zul.xsd | 583 +++++++++++++----- org.adempiere.ui.zk/WEB-INF/zk.xml | 11 +- .../theme/default/vendor-logo.zul | 2 +- org.zkoss.zk.library/.classpath | 24 +- org.zkoss.zk.library/META-INF/MANIFEST.MF | 468 ++++++++------ .../util/resource/ClassLocator$Resource.class | Bin 1059 -> 0 bytes .../resource/ClassLocator$XMLResource.class | Bin 3527 -> 0 bytes .../zkoss/util/resource/ClassLocator.class | Bin 6227 -> 0 bytes .../bin/org/zkoss/zk/library/Activator.class | Bin 782 -> 0 bytes org.zkoss.zk.library/build.properties | 19 +- .../org/zkoss/util/resource/ClassLocator.java | 102 +-- 123 files changed, 1490 insertions(+), 1342 deletions(-) delete mode 100644 org.adempiere.ui.zk/WEB-INF/src/org/zkoss/zkmax/zul/render/Combobox2Default.java delete mode 100755 org.adempiere.ui.zk/WEB-INF/tld/zul/core.dsp.tld delete mode 100644 org.zkoss.zk.library/bin/org/zkoss/util/resource/ClassLocator$Resource.class delete mode 100644 org.zkoss.zk.library/bin/org/zkoss/util/resource/ClassLocator$XMLResource.class delete mode 100644 org.zkoss.zk.library/bin/org/zkoss/util/resource/ClassLocator.class delete mode 100644 org.zkoss.zk.library/bin/org/zkoss/zk/library/Activator.class diff --git a/.hgignore b/.hgignore index 0c6d809c04..221ebcbd7a 100644 --- a/.hgignore +++ b/.hgignore @@ -97,4 +97,10 @@ syntax: regexp ^work/.*$ syntax: regexp -swingclient.product .* \ No newline at end of file +swingclient.product .* +syntax: regexp +^org\.zkoss\.zk\.library/bin$ +syntax: regexp +\.class$ +syntax: regexp +\.class$ \ No newline at end of file diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF index 27faaa4c9e..2b05b7bf43 100644 --- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF @@ -32,7 +32,7 @@ Require-Bundle: org.adempiere.report.jasper;bundle-version="1.0.0", org.adempiere.base;bundle-version="1.0.0", org.adempiere.report.jasper.library;bundle-version="1.0.0", org.adempiere.ui;bundle-version="1.0.0", - org.zkoss.zk.library;bundle-version="3.6.3" + org.zkoss.zk.library;bundle-version="6.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Eclipse-ExtensibleAPI: true Import-Package: javax.servlet, diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java index d133b9624e..63d904abbb 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java @@ -43,7 +43,6 @@ import org.compiere.model.MUser; import org.compiere.util.CLogger; import org.compiere.util.Env; import org.compiere.util.Language; -import org.zkoss.zk.au.Command; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.Page; @@ -122,6 +121,10 @@ public class AdempiereWebUI extends Window implements EventListener, IWebClient { loginCompleted(); } + + Executions.getCurrent().getDesktop().addListener(new DrillCommand()); + Executions.getCurrent().getDesktop().addListener(new TokenCommand()); + Executions.getCurrent().getDesktop().addListener(new ZoomCommand()); } public void onOk() @@ -361,13 +364,5 @@ public class AdempiereWebUI extends Window implements EventListener, IWebClient */ public UserPreference getUserPreference() { return userPreference; - } - - //global command - static { - new ZoomCommand("onZoom", Command.IGNORE_OLD_EQUIV); - new DrillCommand("onDrillAcross", Command.IGNORE_OLD_EQUIV); - new DrillCommand("onDrillDown", Command.IGNORE_OLD_EQUIV); - new TokenCommand(TokenEvent.ON_USER_TOKEN, Command.IGNORE_OLD_EQUIV); - } + } } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ClientInfo.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ClientInfo.java index 744265e37c..9805ba20a2 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ClientInfo.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ClientInfo.java @@ -16,6 +16,7 @@ *****************************************************************************/ package org.adempiere.webui; +import java.io.Serializable; import java.util.TimeZone; /** @@ -23,7 +24,12 @@ import java.util.TimeZone; * @author Low Heng Sin * */ -public class ClientInfo { +public class ClientInfo implements Serializable { + /** + * + */ + private static final long serialVersionUID = -713195891415378500L; + public int colorDepth; public int desktopWidth; public int desktopHeight; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/LayoutUtils.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/LayoutUtils.java index 39e3ec3e97..6610153249 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/LayoutUtils.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/LayoutUtils.java @@ -17,7 +17,7 @@ import org.zkoss.zk.au.out.AuScript; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.HtmlBasedComponent; import org.zkoss.zk.ui.util.Clients; -import org.zkoss.zkex.zul.Borderlayout; +import org.zkoss.zul.Borderlayout; import org.zkoss.zul.Div; /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WLogin.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WLogin.java index 20dee1e620..976d5bf8bf 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WLogin.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WLogin.java @@ -24,12 +24,12 @@ import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.UiException; import org.zkoss.zk.ui.metainfo.PageDefinition; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.East; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; -import org.zkoss.zkex.zul.West; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.East; +import org.zkoss.zul.North; +import org.zkoss.zul.South; +import org.zkoss.zul.West; import org.zkoss.zul.Div; import org.zkoss.zul.Vbox; import org.zkoss.zul.Window; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java index dd7220ea44..473adeca7b 100755 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java @@ -61,9 +61,9 @@ import org.compiere.util.ValueNamePair; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.South; import org.zkoss.zul.Caption; import org.zkoss.zul.Filedownload; import org.zkoss.zul.Groupbox; @@ -520,7 +520,7 @@ public class WAcctViewer extends Window implements EventListener southPanel.setWidths("80%, 20%"); Grid southLeftGrid = new Grid(); southLeftGrid.setInnerWidth(""); - southLeftGrid.setInnerHeight(""); + southLeftGrid.setHeight(""); southLeftGrid.makeNoStrip(); southLeftGrid.setStyle("border: none; margin: none"); southPanel.appendChild(southLeftGrid); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java index c4239742b7..d6e7469db4 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java @@ -39,10 +39,10 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.util.Clients; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Div; import org.zkoss.zul.Hbox; import org.zkoss.zul.Html; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java index 11c1fe2c3e..d0f376c3ad 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java @@ -309,7 +309,7 @@ public class ProcessModalDialog extends Window implements EventListener, IProces if (m_processMonitor != null) { m_processMonitor.lockUI(m_pi); - Clients.showBusy(null, false); + Clients.clearBusy(); } lockUI(m_pi); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java index bdc5f60f76..0c8afa1df6 100755 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java @@ -53,10 +53,10 @@ import org.compiere.util.Msg; import org.compiere.util.Trx; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Separator; import org.zkoss.zul.Space; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java index 84fe4048d4..1b1c7b46c5 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java @@ -49,10 +49,10 @@ import org.zkoss.zk.ui.WrongValueException; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Separator; /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromInvoiceUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromInvoiceUI.java index 4ff64825c5..79a1ff1e8a 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromInvoiceUI.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromInvoiceUI.java @@ -44,8 +44,8 @@ import org.compiere.util.KeyNamePair; import org.compiere.util.Msg; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; import org.zkoss.zul.Space; public class WCreateFromInvoiceUI extends CreateFromInvoice implements EventListener, ValueChangeListener diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromRMAUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromRMAUI.java index fcfe17b076..b7b8a41d02 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromRMAUI.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromRMAUI.java @@ -36,8 +36,8 @@ import org.compiere.util.CLogger; import org.compiere.util.DisplayType; import org.compiere.util.Env; import org.compiere.util.Msg; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; public class WCreateFromRMAUI extends CreateFromRMA implements ValueChangeListener { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java index 4559287e4e..4b1f8b0bd0 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java @@ -53,8 +53,8 @@ import org.compiere.util.Msg; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; import org.zkoss.zul.Space; public class WCreateFromShipmentUI extends CreateFromShipment implements EventListener, ValueChangeListener diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java index 291b0bf3ee..c906e9ec54 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java @@ -51,8 +51,8 @@ import org.compiere.util.Msg; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; import org.zkoss.zul.Hbox; public class WCreateFromStatementUI extends CreateFromStatement implements EventListener diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromWindow.java index 6b0b8995af..3f9a743592 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromWindow.java @@ -30,10 +30,10 @@ import org.compiere.util.Trx; import org.compiere.util.TrxRunnable; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Separator; public class WCreateFromWindow extends Window implements EventListener, WTableModelListener diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFileImport.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFileImport.java index 2f34557e11..26849b915d 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFileImport.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFileImport.java @@ -53,10 +53,10 @@ import org.zkoss.util.media.Media; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Div; import org.zkoss.zul.Fileupload; import org.zkoss.zul.Hbox; @@ -321,14 +321,7 @@ public class WFileImport extends ADForm implements EventListener { Media media = null; - try - { - media = Fileupload.get(); - } - catch (InterruptedException e) - { - e.printStackTrace(); - } + media = Fileupload.get(); if (media == null) return; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java index 39c3995bff..c8f1eadc9e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java @@ -57,10 +57,10 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.util.Clients; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Div; import org.zkoss.zul.Html; @@ -206,7 +206,7 @@ public class WGenForm extends ADForm implements EventListener, WTableModelListen public void postQueryEvent() { - Clients.showBusy(Msg.getMsg(Env.getCtx(), "Processing"), true); + Clients.showBusy(Msg.getMsg(Env.getCtx(), "Processing")); Events.echoEvent("onExecuteQuery", this, null); } @@ -221,7 +221,7 @@ public class WGenForm extends ADForm implements EventListener, WTableModelListen } finally { - Clients.showBusy(null, false); + Clients.clearBusy(); } } @@ -341,7 +341,7 @@ public class WGenForm extends ADForm implements EventListener, WTableModelListen // OK to print if (FDialog.ask(getWindowNo(), this, genForm.getAskPrintMsg())) { - Clients.showBusy("Processing...", true); + Clients.showBusy("Processing..."); Clients.response(new AuEcho(this, "onPrint", null)); } // OK to print } @@ -378,14 +378,14 @@ public class WGenForm extends ADForm implements EventListener, WTableModelListen File outFile = File.createTempFile(genForm.getClass().getName(), ".pdf"); AEnv.mergePdf(pdfList, outFile); - Clients.showBusy(null, false); + Clients.clearBusy(); Window win = new SimplePDFViewer(getFormName(), new FileInputStream(outFile)); SessionManager.getAppDesktop().showWindow(win, "center"); } catch (Exception e) { log.log(Level.SEVERE, e.getLocalizedMessage(), e); } } else if (pdfList.size() > 0) { - Clients.showBusy(null, false); + Clients.clearBusy(); try { Window win = new SimplePDFViewer(getFormName(), new FileInputStream(pdfList.get(0))); SessionManager.getAppDesktop().showWindow(win, "center"); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMatch.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMatch.java index b4e4ed711f..b09134e29a 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMatch.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMatch.java @@ -56,10 +56,10 @@ import org.compiere.util.Msg; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Separator; import org.zkoss.zul.Space; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMerge.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMerge.java index 4642e13126..4ad0ed9f8e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMerge.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMerge.java @@ -43,9 +43,9 @@ import org.zkoss.zk.au.out.AuEcho; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.util.Clients; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.South; /** * Merge Dialog. @@ -265,7 +265,7 @@ public class WMerge extends Merge implements IFormController, EventListener m_success = merge (columnName, from_ID, to_ID); postMerge(columnName, to_ID); } finally{ - Clients.showBusy(null, false); + Clients.clearBusy(); Clients.response(new AuEcho(form, "onAfterProcess", null)); } } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java index feadafbe1a..0e738cb834 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java @@ -58,9 +58,9 @@ import org.compiere.util.PaymentExport; import org.compiere.util.ValueNamePair; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.South; import org.zkoss.zul.Filedownload; /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaySelect.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaySelect.java index f421058825..f1a5ebfff2 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaySelect.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaySelect.java @@ -56,10 +56,10 @@ import org.zkoss.zk.ui.SuspendNotAllowedException; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.util.Clients; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Separator; import org.zkoss.zul.Space; @@ -388,8 +388,6 @@ public class WPaySelect extends PaySelect dialog.doModal(); } catch (SuspendNotAllowedException e) { log.log(Level.SEVERE, e.getLocalizedMessage(), e); - } catch (InterruptedException e) { - log.log(Level.SEVERE, e.getLocalizedMessage(), e); } } } // generatePaySelect @@ -402,7 +400,7 @@ public class WPaySelect extends PaySelect { if (m_isLock) return; m_isLock = true; - Clients.showBusy(null, true); + Clients.showBusy(null); } // lockUI /** @@ -414,7 +412,7 @@ public class WPaySelect extends PaySelect if (!m_isLock) return; m_isLock = false; m_pi = pi; - Clients.showBusy(null, false); + Clients.clearBusy(); //TODO: The response returned is always Cancel // if (!FDialog.ask(0, form, "VPaySelectPrint?", "(" + m_pi.getSummary() + ")")) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayment.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayment.java index c4773e5b1e..3da0cfcbe2 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayment.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayment.java @@ -72,10 +72,10 @@ import org.zkoss.zk.au.out.AuEcho; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.util.Clients; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Space; /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java index e0514bebea..b2b4753d14 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java @@ -41,12 +41,12 @@ import org.compiere.util.Msg; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.East; -import org.zkoss.zkex.zul.North; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.East; +import org.zkoss.zul.North; import org.zkoss.zul.ListModel; -import org.zkoss.zul.SimpleTreeNode; +import org.zkoss.zul.DefaultTreeNode; import org.zkoss.zul.Space; import org.zkoss.zul.Splitter; import org.zkoss.zul.Tree; @@ -300,9 +300,9 @@ public class WTreeMaintenance extends TreeMaintenance implements IFormController if (selected != null) // allow add if not in tree { SimpleTreeModel tm = (SimpleTreeModel) centerTree.getModel(); - SimpleTreeNode stn = tm.find(tm.getRoot(), selected.id); + DefaultTreeNode stn = tm.find(tm.getRoot(), selected.id); if (stn != null) { - int[] path = tm.getPath(tm.getRoot(), stn); + int[] path = tm.getPath(stn); Treeitem ti = centerTree.renderItemByPath(path); ti.setSelected(true); } @@ -317,7 +317,7 @@ public class WTreeMaintenance extends TreeMaintenance implements IFormController private void onTreeSelection (Event e) { Treeitem ti = centerTree.getSelectedItem(); - SimpleTreeNode stn = (SimpleTreeNode) ti.getValue(); + DefaultTreeNode stn = (DefaultTreeNode) ti.getValue(); MTreeNode tn = (MTreeNode)stn.getData(); log.info(tn.toString()); if (tn == null) @@ -344,17 +344,17 @@ public class WTreeMaintenance extends TreeMaintenance implements IFormController if (item != null) { SimpleTreeModel model = (SimpleTreeModel) centerTree.getModel(); - SimpleTreeNode stn = model.find(model.getRoot(), item.id); + DefaultTreeNode stn = model.find(model.getRoot(), item.id); if (stn != null) { MTreeNode tNode = (MTreeNode) stn.getData(); tNode.setName(item.name); tNode.setAllowsChildren(item.isSummary); tNode.setImageIndicator(item.imageIndicator); model.nodeUpdated(stn); - Treeitem ti = centerTree.renderItemByPath(model.getPath(model.getRoot(), stn)); + Treeitem ti = centerTree.renderItemByPath(model.getPath(stn)); ti.setTooltiptext(item.description); } else { - stn = new SimpleTreeNode(new MTreeNode(item.id, 0, item.name, item.description, 0, item.isSummary, + stn = new DefaultTreeNode(new MTreeNode(item.id, 0, item.name, item.description, 0, item.isSummary, item.imageIndicator, false, null), new ArrayList()); model.addNode(stn); } @@ -373,7 +373,7 @@ public class WTreeMaintenance extends TreeMaintenance implements IFormController if (item != null) { SimpleTreeModel model = (SimpleTreeModel) centerTree.getModel(); - SimpleTreeNode stn = model.find(model.getRoot(), item.id); + DefaultTreeNode stn = model.find(model.getRoot(), item.id); if (stn != null) model.removeNode(stn); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTrxMaterial.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTrxMaterial.java index 505ac9b413..f11ddb2e30 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTrxMaterial.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTrxMaterial.java @@ -50,10 +50,10 @@ import org.compiere.util.Env; import org.compiere.util.Msg; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Separator; /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java index 3bbbe7d55b..19e416315b 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java @@ -55,9 +55,9 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.MouseEvent; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.East; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.East; import org.zkoss.zul.Area; import org.zkoss.zul.Div; import org.zkoss.zul.Imagemap; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFEditor.java index 5838b04f0d..d2b1f2013a 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFEditor.java @@ -50,10 +50,10 @@ import org.zkoss.zk.ui.event.DropEvent; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Div; import org.zkoss.zul.Hbox; import org.zkoss.zul.Label; @@ -215,8 +215,6 @@ public class WFEditor extends ADForm { w.doModal(); } catch (SuspendNotAllowedException e) { e.printStackTrace(); - } catch (InterruptedException e) { - e.printStackTrace(); } String name = text.getText(); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFPanel.java index 4af960f78d..8ed0ed7f98 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFPanel.java @@ -33,9 +33,9 @@ import org.zkoss.zhtml.Tr; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.South; import org.zkoss.zul.Div; import org.zkoss.zul.Html; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java index ba98884099..0cf03579ae 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java @@ -59,10 +59,10 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.util.Clients; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Div; import org.zkoss.zul.Hbox; import org.zkoss.zul.Html; @@ -275,7 +275,7 @@ public class WWFActivity extends ADForm implements EventListener cmd_zoom(); else if (comp == bOK) { - Clients.showBusy(Msg.getMsg(Env.getCtx(), "Processing"), true); + Clients.showBusy(Msg.getMsg(Env.getCtx(), "Processing")); Events.echoEvent("onOK", this, null); } else if (comp == fAnswerButton) @@ -595,7 +595,7 @@ public class WWFActivity extends ADForm implements EventListener log.config("Activity=" + m_activity); if (m_activity == null) { - Clients.showBusy(null, false); + Clients.clearBusy(); return; } int AD_User_ID = Env.getAD_User_ID(Env.getCtx()); @@ -689,7 +689,7 @@ public class WWFActivity extends ADForm implements EventListener } finally { - Clients.showBusy(null, false); + Clients.clearBusy(); if (trx != null) trx.close(); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ADTabListModel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ADTabListModel.java index 2224c7b7f7..fc51f45604 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ADTabListModel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ADTabListModel.java @@ -68,7 +68,8 @@ public class ADTabListModel extends AbstractListModel implements ListitemRendere } } - public void render(Listitem item, Object data) throws Exception { + @Override + public void render(Listitem item, Object data, int index) throws Exception { ADTabLabel tabLabel = (ADTabLabel)data; Listcell cell = new Listcell(tabLabel.label, null); if (tabLabel.tabLevel > 0) { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ADTreeOnDropListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ADTreeOnDropListener.java index 27cc96cba0..a1df8c5874 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ADTreeOnDropListener.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ADTreeOnDropListener.java @@ -24,7 +24,7 @@ import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zul.Menuitem; import org.zkoss.zul.Menupopup; -import org.zkoss.zul.SimpleTreeNode; +import org.zkoss.zul.DefaultTreeNode; import org.zkoss.zul.Tree; import org.zkoss.zul.Treeitem; import org.zkoss.zul.Treerow; @@ -67,7 +67,7 @@ public class ADTreeOnDropListener implements EventListener { if (de.getDragged() != de.getTarget()) { Treeitem src = (Treeitem) ((Treerow) de.getDragged()).getParent(); Treeitem target = (Treeitem) ((Treerow) de.getTarget()).getParent(); - moveNode((SimpleTreeNode)src.getValue(), (SimpleTreeNode)target.getValue()); + moveNode((DefaultTreeNode)src.getValue(), (DefaultTreeNode)target.getValue()); } } } @@ -77,7 +77,7 @@ public class ADTreeOnDropListener implements EventListener { * @param movingNode The node to be moved * @param toNode The target node */ - private void moveNode(SimpleTreeNode movingNode, SimpleTreeNode toNode) + private void moveNode(DefaultTreeNode movingNode, DefaultTreeNode toNode) { log.info(movingNode.toString() + " to " + toNode.toString()); @@ -86,7 +86,7 @@ public class ADTreeOnDropListener implements EventListener { MTreeNode toMNode = (MTreeNode) toNode.getData(); - SimpleTreeNode newParent; + DefaultTreeNode newParent; int index; if (!toMNode.isSummary()) // drop on a child node { @@ -95,7 +95,7 @@ public class ADTreeOnDropListener implements EventListener { else // drop on a summary node { //prompt user to select insert after or drop into the summary node - int path[] = treeModel.getPath(treeModel.getRoot(), toNode); + int path[] = treeModel.getPath(toNode); Treeitem toItem = tree.renderItemByPath(path); tree.setSelectedItem(toItem); @@ -121,13 +121,13 @@ public class ADTreeOnDropListener implements EventListener { } // moveNode - private void moveNode(SimpleTreeNode movingNode, SimpleTreeNode toNode, boolean moveInto) + private void moveNode(DefaultTreeNode movingNode, DefaultTreeNode toNode, boolean moveInto) { - SimpleTreeNode newParent; + DefaultTreeNode newParent; int index; // remove - SimpleTreeNode oldParent = treeModel.getParent(movingNode); + DefaultTreeNode oldParent = treeModel.getParent(movingNode); treeModel.removeNode(movingNode); //get new index @@ -145,7 +145,7 @@ public class ADTreeOnDropListener implements EventListener { // insert treeModel.addNode(newParent, movingNode, index); - int path[] = treeModel.getPath(treeModel.getRoot(), movingNode); + int path[] = treeModel.getPath(movingNode); Treeitem movingItem = tree.renderItemByPath(path); tree.setSelectedItem(movingItem); Events.sendEvent(tree, new Event(Events.ON_SELECT, tree)); @@ -158,7 +158,7 @@ public class ADTreeOnDropListener implements EventListener { MTreeNode oldMParent = (MTreeNode) oldParent.getData(); for (int i = 0; i < oldParent.getChildCount(); i++) { - SimpleTreeNode nd = (SimpleTreeNode)oldParent.getChildAt(i); + DefaultTreeNode nd = (DefaultTreeNode)oldParent.getChildAt(i); MTreeNode md = (MTreeNode) nd.getData(); StringBuffer sql = new StringBuffer("UPDATE "); sql.append(mTree.getNodeTableName()) @@ -175,7 +175,7 @@ public class ADTreeOnDropListener implements EventListener { MTreeNode newMParent = (MTreeNode) newParent.getData(); for (int i = 0; i < newParent.getChildCount(); i++) { - SimpleTreeNode nd = (SimpleTreeNode)newParent.getChildAt(i); + DefaultTreeNode nd = (DefaultTreeNode)newParent.getChildAt(i); MTreeNode md = (MTreeNode) nd.getData(); StringBuffer sql = new StringBuffer("UPDATE "); sql.append(mTree.getNodeTableName()) @@ -201,9 +201,9 @@ public class ADTreeOnDropListener implements EventListener { } class MenuListener implements EventListener { - private SimpleTreeNode movingNode; - private SimpleTreeNode toNode; - MenuListener(SimpleTreeNode movingNode, SimpleTreeNode toNode) { + private DefaultTreeNode movingNode; + private DefaultTreeNode toNode; + MenuListener(DefaultTreeNode movingNode, DefaultTreeNode toNode) { this.movingNode = movingNode; this.toNode = toNode; } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Accordion.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Accordion.java index b43b86440c..8ffcdefac2 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Accordion.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Accordion.java @@ -20,10 +20,10 @@ import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Div; import org.zkoss.zul.Vbox; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Borderlayout.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Borderlayout.java index d0aab9cb00..f9167f0ad9 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Borderlayout.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Borderlayout.java @@ -4,17 +4,17 @@ package org.adempiere.webui.component; import org.zkoss.zk.ui.Component; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.East; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; -import org.zkoss.zkex.zul.West; +import org.zkoss.zul.Center; +import org.zkoss.zul.East; +import org.zkoss.zul.North; +import org.zkoss.zul.South; +import org.zkoss.zul.West; /** * @author teo_sarca * */ -public class Borderlayout extends org.zkoss.zkex.zul.Borderlayout +public class Borderlayout extends org.zkoss.zul.Borderlayout { /** * diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Combobox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Combobox.java index 7c206101b6..3fbf73f455 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Combobox.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Combobox.java @@ -119,9 +119,12 @@ public class Combobox extends org.zkoss.zul.Combobox return item.getValue().equals(value); } + //TODO: Find zk6 replacement /** Returns RS_NO_WIDTH|RS_NO_HEIGHT. */ + /* protected int getRealStyleFlags() { return super.getRealStyleFlags() & 0x0006; } + */ } \ No newline at end of file diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/DrillCommand.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/DrillCommand.java index 72430bd803..eaa2b815af 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/DrillCommand.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/DrillCommand.java @@ -13,11 +13,13 @@ *****************************************************************************/ package org.adempiere.webui.component; +import java.util.Map; + import org.adempiere.webui.event.DrillEvent; import org.compiere.model.MQuery; import org.zkoss.lang.Objects; import org.zkoss.zk.au.AuRequest; -import org.zkoss.zk.au.Command; +import org.zkoss.zk.au.AuService; import org.zkoss.zk.mesg.MZk; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.UiException; @@ -28,15 +30,18 @@ import org.zkoss.zk.ui.event.Events; * @author hengsin * */ -public class DrillCommand extends Command { +public class DrillCommand implements AuService { - public DrillCommand(String id, int flags) { - super(id, flags); + public DrillCommand() { } - @Override - protected void process(AuRequest request) { - final String[] data = request.getData(); + public boolean service(AuRequest request, boolean everError) { + if (!DrillEvent.ON_DRILL_ACROSS.equals(request.getCommand()) + && !DrillEvent.ON_DRILL_DOWN.equals(request.getCommand())) + return false; + + final Map map = request.getData(); + String[] data = (String[]) map.get(""); final Component comp = request.getComponent(); if (comp == null) @@ -53,6 +58,8 @@ public class DrillCommand extends Command { MQuery query = new MQuery(tableName); query.addRestriction(columnName, MQuery.EQUAL, code); - Events.postEvent(new DrillEvent(getId(), comp, query)); + Events.postEvent(new DrillEvent(request.getCommand(), comp, query)); + + return true; } } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/FolderBrowser.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/FolderBrowser.java index 4920b54c8f..bb7ddbd817 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/FolderBrowser.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/FolderBrowser.java @@ -24,10 +24,10 @@ import org.compiere.util.ValueNamePair; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; /** * Directory and File Browser diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridPanel.java index 45159c7e61..11f5dc1848 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridPanel.java @@ -37,9 +37,9 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.util.Clients; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.South; import org.zkoss.zul.Column; import org.zkoss.zul.Div; import org.zkoss.zul.Paging; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTabListItemRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTabListItemRenderer.java index ab8fbea987..7aa850508a 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTabListItemRenderer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTabListItemRenderer.java @@ -76,7 +76,8 @@ public class GridTabListItemRenderer implements ListitemRenderer, ListitemRender * @param data * @see ListitemRenderer#render(Listitem, Object) */ - public void render(Listitem listitem, Object data) throws Exception { + @Override + public void render(Listitem listitem, Object data, int index) throws Exception { //don't render if not visible for(Component c = listitem.getParent(); c != null; c = c.getParent()) { if (!c.isVisible()) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTabRowRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTabRowRenderer.java index e78db77337..fe17434cfa 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTabRowRenderer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTabRowRenderer.java @@ -344,7 +344,8 @@ public class GridTabRowRenderer implements RowRenderer, RowRendererExt, Renderer * @param data * @see RowRenderer#render(Row, Object) */ - public void render(Row row, Object data) throws Exception { + @Override + public void render(Row row, Object data, int index) throws Exception { //don't render if not visible if (gridPanel != null && !gridPanel.isVisible()) { return; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTableListModel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTableListModel.java index c1648c372f..c9dcc14cb4 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTableListModel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTableListModel.java @@ -224,4 +224,9 @@ public class GridTableListModel extends AbstractListModel implements TableModelL editing = b; } + @Override + public String getSortDirection(Comparator cmpr) { + return "natural"; + } + } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListPanel.java index ed2aa0156e..ce90aa6675 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListPanel.java @@ -29,9 +29,9 @@ import org.compiere.util.DisplayType; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.South; import org.zkoss.zul.Paging; import org.zkoss.zul.event.ZulEvents; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Listbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Listbox.java index d9ebf2720d..ae48537cb9 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Listbox.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Listbox.java @@ -99,12 +99,6 @@ public class Listbox extends org.zkoss.zul.Listbox implements EventListener return (ListItem)super.getSelectedItem(); } - @SuppressWarnings("unchecked") - public List getItems() - { - return (List)super.getItems(); - } - /** * Set selected item for the list box based on the value of list item * set selected to none if no item found matching the value given or @@ -120,8 +114,8 @@ public class Listbox extends org.zkoss.zul.Listbox implements EventListener return ; } - List items = getItems(); - for (ListItem item : items) + List items = getItems(); + for (Listitem item : items) { if (value.getClass() != item.getValue().getClass()) { // if the classes of value and item are different convert both to String @@ -331,7 +325,7 @@ public class Listbox extends org.zkoss.zul.Listbox implements EventListener @Override public String toString() { StringBuffer items = new StringBuffer("["); - for (ListItem item : getItems()) { + for (Listitem item : getItems()) { if (items.length() > 1) items.append(", "); items.append(item.toString()); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java index 29ed552143..db3e8a8676 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java @@ -132,7 +132,7 @@ public class NumberBox extends Div public void setValue(Object value) { if (value == null) - decimalBox.setValue(null); + decimalBox.setValue((BigDecimal) null); else if (value instanceof BigDecimal) decimalBox.setValue((BigDecimal) value); else if (value instanceof Number) @@ -199,7 +199,7 @@ public class NumberBox extends Div char separatorChar = DisplayType.getNumberFormat(DisplayType.Number, Env.getLanguage(Env.getCtx())).getDecimalFormatSymbols().getDecimalSeparator(); txtCalc = new Textbox(); - txtCalc.setAction("onKeyPress : return calc.validate('" + + txtCalc.setWidgetListener("onKeyPress", "return calc.validate('" + decimalBox.getId() + "','" + txtCalc.getId() + "'," + integral + "," + (int)separatorChar + ", event);"); txtCalc.setMaxlength(250); @@ -213,27 +213,27 @@ public class NumberBox extends Div Button btnAC = new Button(); btnAC.setWidth("40px"); btnAC.setLabel("AC"); - btnAC.setAction("onClick : calc.clearAll('" + txtCalcId + "')"); + btnAC.setWidgetListener("onClick", "calc.clearAll('" + txtCalcId + "')"); Button btn7 = new Button(); btn7.setWidth("30px"); btn7.setLabel("7"); - btn7.setAction("onClick : calc.append('" + txtCalcId + "', '7')"); + btn7.setWidgetListener("onClick", "calc.append('" + txtCalcId + "', '7')"); Button btn8 = new Button(); btn8.setWidth("30px"); btn8.setLabel("8"); - btn8.setAction("onClick : calc.append('" + txtCalcId + "', '8')"); + btn8.setWidgetListener("onClick", "calc.append('" + txtCalcId + "', '8')"); Button btn9 = new Button(); btn9.setWidth("30px"); btn9.setLabel("9"); - btn9.setAction("onClick : calc.append('" + txtCalcId + "', '9')"); + btn9.setWidgetListener("onClick", "calc.append('" + txtCalcId + "', '9')"); Button btnMultiply = new Button(); btnMultiply.setWidth("30px"); btnMultiply.setLabel("*"); - btnMultiply.setAction("onClick : calc.append('" + txtCalcId + "', ' * ')"); + btnMultiply.setWidgetListener("onClick", "calc.append('" + txtCalcId + "', ' * ')"); row1.appendChild(btnAC); row1.appendChild(btn7); @@ -246,27 +246,27 @@ public class NumberBox extends Div Button btnC = new Button(); btnC.setWidth("40px"); btnC.setLabel("C"); - btnC.setAction("onClick : calc.clear('" + txtCalcId + "')"); + btnC.setWidgetListener("onClick", "calc.clear('" + txtCalcId + "')"); Button btn4 = new Button(); btn4.setWidth("30px"); btn4.setLabel("4"); - btn4.setAction("onClick : calc.append('" + txtCalcId + "', '4')"); + btn4.setWidgetListener("onClick", "calc.append('" + txtCalcId + "', '4')"); Button btn5 = new Button(); btn5.setWidth("30px"); btn5.setLabel("5"); - btn5.setAction("onClick : calc.append('" + txtCalcId + "', '5')"); + btn5.setWidgetListener("onClick", "calc.append('" + txtCalcId + "', '5')"); Button btn6 = new Button(); btn6.setWidth("30px"); btn6.setLabel("6"); - btn6.setAction("onClick : calc.append('" + txtCalcId + "', '6')"); + btn6.setWidgetListener("onClick", "calc.append('" + txtCalcId + "', '6')"); Button btnDivide = new Button(); btnDivide.setWidth("30px"); btnDivide.setLabel("/"); - btnDivide.setAction("onClick : calc.append('" + txtCalcId + "', ' / ')"); + btnDivide.setWidgetListener("onClick", "calc.append('" + txtCalcId + "', ' / ')"); row2.appendChild(btnC); row2.appendChild(btn4); @@ -279,27 +279,27 @@ public class NumberBox extends Div Button btnModulo = new Button(); btnModulo.setWidth("40px"); btnModulo.setLabel("%"); - btnModulo.setAction("onClick : calc.append('" + txtCalcId + "', ' % ')"); + btnModulo.setWidgetListener("onClick", "calc.append('" + txtCalcId + "', ' % ')"); Button btn1 = new Button(); btn1.setWidth("30px"); btn1.setLabel("1"); - btn1.setAction("onClick : calc.append('" + txtCalcId + "', '1')"); + btn1.setWidgetListener("onClick", "calc.append('" + txtCalcId + "', '1')"); Button btn2 = new Button(); btn2.setWidth("30px"); btn2.setLabel("2"); - btn2.setAction("onClick : calc.append('" + txtCalcId + "', '2')"); + btn2.setWidgetListener("onClick", "calc.append('" + txtCalcId + "', '2')"); Button btn3 = new Button(); btn3.setWidth("30px"); btn3.setLabel("3"); - btn3.setAction("onClick : calc.append('" + txtCalcId + "', '3')"); + btn3.setWidgetListener("onClick", "calc.append('" + txtCalcId + "', '3')"); Button btnSubstract = new Button(); btnSubstract.setWidth("30px"); btnSubstract.setLabel("-"); - btnSubstract.setAction("onClick : calc.append('" + txtCalcId + "', ' - ')"); + btnSubstract.setWidgetListener("onClick", "calc.append('" + txtCalcId + "', ' - ')"); row3.appendChild(btnModulo); row3.appendChild(btn1); @@ -317,25 +317,25 @@ public class NumberBox extends Div Button btn0 = new Button(); btn0.setWidth("30px"); btn0.setLabel("0"); - btn0.setAction("onClick : calc.append('" + txtCalcId + "', '0')"); + btn0.setWidgetListener("onClick", "calc.append('" + txtCalcId + "', '0')"); String separator = Character.toString(separatorChar); Button btnDot = new Button(); btnDot.setWidth("30px"); btnDot.setLabel(separator); btnDot.setDisabled(integral); - btnDot.setAction("onClick : calc.append('" + txtCalcId + "', '" + separator + "')"); + btnDot.setWidgetListener("onClick", "calc.append('" + txtCalcId + "', '" + separator + "')"); Button btnEqual = new Button(); btnEqual.setWidth("30px"); btnEqual.setLabel("="); - btnEqual.setAction("onClick : calc.evaluate('" + decimalBox.getId() + "','" + btnEqual.setWidgetListener("onClick", "calc.evaluate('" + decimalBox.getId() + "','" + txtCalcId + "','" + separator + "')"); Button btnAdd = new Button(); btnAdd.setWidth("30px"); btnAdd.setLabel("+"); - btnAdd.setAction("onClick : calc.append('" + txtCalcId + "', ' + ')"); + btnAdd.setWidgetListener("onClick", "calc.append('" + txtCalcId + "', ' + ')"); row4.appendChild(btnCurrency); row4.appendChild(btnDot); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/SimpleListModel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/SimpleListModel.java index 49e7742409..b3bbc6bff3 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/SimpleListModel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/SimpleListModel.java @@ -68,7 +68,8 @@ public class SimpleListModel extends AbstractListModel implements ListitemRender .append(src.substring(0, j)).append("..."); } - public void render(Listitem item, Object data) throws Exception { + @Override + public void render(Listitem item, Object data, int index) throws Exception { if (data instanceof Object[]) { renderArray(item, (Object[])data); } else if (data instanceof Collection) { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/SimpleTreeModel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/SimpleTreeModel.java index 57841a6afb..cdfc11b69e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/SimpleTreeModel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/SimpleTreeModel.java @@ -25,8 +25,9 @@ import org.zkoss.lang.Objects; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zul.SimpleTreeNode; +import org.zkoss.zul.DefaultTreeNode; import org.zkoss.zul.Tree; +import org.zkoss.zul.TreeNode; import org.zkoss.zul.Treecell; import org.zkoss.zul.Treecol; import org.zkoss.zul.Treecols; @@ -40,7 +41,7 @@ import org.zkoss.zul.event.TreeDataEvent; * @author Low Heng Sin * */ -public class SimpleTreeModel extends org.zkoss.zul.SimpleTreeModel implements TreeitemRenderer, EventListener { +public class SimpleTreeModel extends org.zkoss.zul.DefaultTreeModel implements TreeitemRenderer, EventListener { /** * @@ -52,7 +53,7 @@ public class SimpleTreeModel extends org.zkoss.zul.SimpleTreeModel implements Tr private boolean itemDraggable; private List onDropListners = new ArrayList(); - public SimpleTreeModel(SimpleTreeNode root) { + public SimpleTreeModel(DefaultTreeNode root) { super(root); } @@ -105,10 +106,10 @@ public class SimpleTreeModel extends org.zkoss.zul.SimpleTreeModel implements Tr SimpleTreeModel model = null; Enumeration nodeEnum = root.children(); - SimpleTreeNode stRoot = new SimpleTreeNode(root, new ArrayList()); + DefaultTreeNode stRoot = new DefaultTreeNode(root, new ArrayList()); while(nodeEnum.hasMoreElements()) { MTreeNode childNode = (MTreeNode)nodeEnum.nextElement(); - SimpleTreeNode stNode = new SimpleTreeNode(childNode, new ArrayList()); + DefaultTreeNode stNode = new DefaultTreeNode(childNode, new ArrayList()); stRoot.getChildren().add(stNode); if (childNode.getChildCount() > 0) { populate(stNode, childNode); @@ -118,11 +119,11 @@ public class SimpleTreeModel extends org.zkoss.zul.SimpleTreeModel implements Tr return model; } - private static void populate(SimpleTreeNode stNode, MTreeNode root) { + private static void populate(DefaultTreeNode stNode, MTreeNode root) { Enumeration nodeEnum = root.children(); while(nodeEnum.hasMoreElements()) { MTreeNode childNode = (MTreeNode)nodeEnum.nextElement(); - SimpleTreeNode stChildNode = new SimpleTreeNode(childNode, new ArrayList()); + DefaultTreeNode stChildNode = new DefaultTreeNode(childNode, new ArrayList()); stNode.getChildren().add(stChildNode); if (childNode.getChildCount() > 0) { populate(stChildNode, childNode); @@ -160,33 +161,33 @@ public class SimpleTreeModel extends org.zkoss.zul.SimpleTreeModel implements Tr * Add to root * @param newNode */ - public void addNode(SimpleTreeNode newNode) { - SimpleTreeNode root = (SimpleTreeNode) getRoot(); + public void addNode(DefaultTreeNode newNode) { + DefaultTreeNode root = (DefaultTreeNode) getRoot(); root.getChildren().add(newNode); fireEvent(root, root.getChildCount() - 1, root.getChildCount() - 1, TreeDataEvent.INTERVAL_ADDED); } @Override - public SimpleTreeNode getRoot() { - return (SimpleTreeNode) super.getRoot(); + public DefaultTreeNode getRoot() { + return (DefaultTreeNode) super.getRoot(); } @Override - public SimpleTreeNode getChild(Object parent, int index) { - return (SimpleTreeNode) super.getChild(parent, index); + public DefaultTreeNode getChild(Object parent, int index) { + return (DefaultTreeNode) super.getChild((TreeNode)parent, index); } /** * @param treeNode */ - public void removeNode(SimpleTreeNode treeNode) { - int path[] = this.getPath(getRoot(), treeNode); + public void removeNode(DefaultTreeNode treeNode) { + int path[] = this.getPath(treeNode); if (path != null && path.length > 0) { - SimpleTreeNode parentNode = getRoot(); + DefaultTreeNode parentNode = getRoot(); int index = path.length - 1; for (int i = 0; i < index; i++) { - parentNode = getChild(parentNode, path[i]); + parentNode = (DefaultTreeNode) getChild((TreeNode)parentNode, path[i]); } @@ -230,16 +231,16 @@ public class SimpleTreeModel extends org.zkoss.zul.SimpleTreeModel implements Tr /** * @param treeNode - * @return SimpleTreeNode + * @return DefaultTreeNode */ - public SimpleTreeNode getParent(SimpleTreeNode treeNode) { - int path[] = this.getPath(getRoot(), treeNode); + public DefaultTreeNode getParent(DefaultTreeNode treeNode) { + int path[] = this.getPath(treeNode); if (path != null && path.length > 0) { - SimpleTreeNode parentNode = getRoot(); + DefaultTreeNode parentNode = getRoot(); int index = path.length - 1; for (int i = 0; i < index; i++) { - parentNode = getChild(parentNode, path[i]); + parentNode = (DefaultTreeNode) getChild((TreeNode)parentNode, path[i]); } return parentNode; @@ -253,7 +254,7 @@ public class SimpleTreeModel extends org.zkoss.zul.SimpleTreeModel implements Tr * @param newNode * @param index */ - public void addNode(SimpleTreeNode newParent, SimpleTreeNode newNode, + public void addNode(DefaultTreeNode newParent, DefaultTreeNode newNode, int index) { newParent.getChildren().add(index, newNode); fireEvent(newParent, index, index, TreeDataEvent.INTERVAL_ADDED); @@ -262,9 +263,9 @@ public class SimpleTreeModel extends org.zkoss.zul.SimpleTreeModel implements Tr /** * @param fromNode * @param recordId - * @return SimpleTreeNode + * @return DefaultTreeNode */ - public SimpleTreeNode find(SimpleTreeNode fromNode, int recordId) { + public DefaultTreeNode find(DefaultTreeNode fromNode, int recordId) { if (fromNode == null) fromNode = getRoot(); MTreeNode data = (MTreeNode) fromNode.getData(); @@ -274,8 +275,8 @@ public class SimpleTreeModel extends org.zkoss.zul.SimpleTreeModel implements Tr return null; int cnt = getChildCount(fromNode); for(int i = 0; i < cnt; i++ ) { - SimpleTreeNode child = getChild(fromNode, i); - SimpleTreeNode treeNode = find(child, recordId); + DefaultTreeNode child = (DefaultTreeNode) getChild(fromNode, i); + DefaultTreeNode treeNode = find(child, recordId); if (treeNode != null) return treeNode; } @@ -285,11 +286,17 @@ public class SimpleTreeModel extends org.zkoss.zul.SimpleTreeModel implements Tr /** * @param node */ - public void nodeUpdated(SimpleTreeNode node) { - SimpleTreeNode parent = getParent(node); + public void nodeUpdated(DefaultTreeNode node) { + DefaultTreeNode parent = getParent(node); if (parent != null) { int i = parent.getChildren().indexOf(node); fireEvent(parent, i, i, TreeDataEvent.CONTENTS_CHANGED); } } + + @Override + public void render(Treeitem arg0, Object arg1, int arg2) throws Exception { + // TODO Auto-generated method stub + + } } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/TokenCommand.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/TokenCommand.java index a5531e33cd..c75f355e5e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/TokenCommand.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/TokenCommand.java @@ -13,10 +13,12 @@ *****************************************************************************/ package org.adempiere.webui.component; +import java.util.Map; + import org.adempiere.webui.event.TokenEvent; import org.zkoss.lang.Objects; import org.zkoss.zk.au.AuRequest; -import org.zkoss.zk.au.Command; +import org.zkoss.zk.au.AuService; import org.zkoss.zk.mesg.MZk; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.UiException; @@ -27,15 +29,17 @@ import org.zkoss.zk.ui.event.Events; * @author hengsin * */ -public class TokenCommand extends Command { +public class TokenCommand implements AuService { - public TokenCommand(String id, int flags) { - super(id, flags); + public TokenCommand() { } - @Override - protected void process(AuRequest request) { - final String[] data = request.getData(); + public boolean service(AuRequest request, boolean everError) { + if (!TokenEvent.ON_USER_TOKEN.equals(request.getCommand())) + return false; + + Map map = request.getData(); + final String[] data = (String[]) map.get(""); final Component comp = request.getComponent(); if (comp == null) @@ -44,7 +48,9 @@ public class TokenCommand extends Command { if (data == null || data.length < 2) throw new UiException(MZk.ILLEGAL_REQUEST_WRONG_DATA, new Object[] { Objects.toString(data), this }); - - Events.postEvent(new TokenEvent(getId(), comp, data)); + + Events.postEvent(new TokenEvent(request.getCommand(), comp, data)); + + return true; } } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListItemRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListItemRenderer.java index 7523572a40..1575b70e91 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListItemRenderer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListItemRenderer.java @@ -128,9 +128,10 @@ public class WListItemRenderer implements ListitemRenderer, EventListener, Listi /* (non-Javadoc) * @see org.zkoss.zul.ListitemRenderer#render(org.zkoss.zul.Listitem, java.lang.Object) */ - public void render(Listitem item, Object data) throws Exception + @Override + public void render(Listitem item, Object data, int index) throws Exception { - render((ListItem)item, data); + render((ListItem)item, data, index); } /** @@ -143,7 +144,7 @@ public class WListItemRenderer implements ListitemRenderer, EventListener, Listi * @throws Exception * @see {@link #render(Listitem, Object)} */ - private void render(ListItem item, Object data) + private void render(ListItem item, Object data, int index) { Listcell listcell = null; int colIndex = 0; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ZoomCommand.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ZoomCommand.java index 3f096ed957..d4ab323a26 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ZoomCommand.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ZoomCommand.java @@ -13,11 +13,13 @@ *****************************************************************************/ package org.adempiere.webui.component; +import java.util.Map; + import org.adempiere.webui.event.ZoomEvent; import org.compiere.model.MQuery; import org.zkoss.lang.Objects; import org.zkoss.zk.au.AuRequest; -import org.zkoss.zk.au.Command; +import org.zkoss.zk.au.AuService; import org.zkoss.zk.mesg.MZk; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.UiException; @@ -28,15 +30,17 @@ import org.zkoss.zk.ui.event.Events; * @author hengsin * */ -public class ZoomCommand extends Command { +public class ZoomCommand implements AuService { - public ZoomCommand(String id, int flags) { - super(id, flags); + public ZoomCommand() { } - @Override - protected void process(AuRequest request) { - final String[] data = request.getData(); + public boolean service(AuRequest request, boolean everError) { + if (!ZoomEvent.EVENT_NAME.equals(request.getCommand())) + return false; + + Map map = request.getData(); + final String[] data = (String[]) map.get(""); final Component comp = request.getComponent(); if (comp == null) @@ -67,6 +71,8 @@ public class ZoomCommand extends Command { query.setRecordCount(1); Events.postEvent(new ZoomEvent(comp, query)); + + return true; } } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/AbstractDesktop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/AbstractDesktop.java index 13c8c822e6..9a42757602 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/AbstractDesktop.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/AbstractDesktop.java @@ -56,10 +56,6 @@ public abstract class AbstractDesktop extends AbstractUIPart implements IDesktop public void onMenuSelected(int menuId) { MMenu menu = new MMenu(Env.getCtx(), menuId, null); - if(menu == null) - { - return; - } if(menu.getAction().equals(MMenu.ACTION_Window)) { @@ -193,14 +189,7 @@ public abstract class AbstractDesktop extends AbstractUIPart implements IDesktop //fall back to highlighted if can't execute doModal if (Events.inEventListener()) { - try - { - win.doModal(); - } - catch(InterruptedException e) - { - - } + win.doModal(); } else { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java index 56a70e0ea7..9277ebbf8d 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java @@ -59,12 +59,12 @@ import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.OpenEvent; import org.zkoss.zk.ui.util.Clients; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.West; -import org.zkoss.zkmax.zul.Portalchildren; -import org.zkoss.zkmax.zul.Portallayout; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.Hlayout; +import org.zkoss.zul.North; +import org.zkoss.zul.Vlayout; +import org.zkoss.zul.West; import org.zkoss.zul.Html; import org.zkoss.zul.Panel; import org.zkoss.zul.Panelchildren; @@ -203,14 +203,14 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria { homeTab.getChildren().clear(); - Portallayout portalLayout = new Portallayout(); + Hlayout portalLayout = new Hlayout(); portalLayout.setWidth("100%"); portalLayout.setHeight("100%"); portalLayout.setStyle("position: absolute; overflow: auto"); homeTab.appendChild(portalLayout); // Dashboard content - Portalchildren portalchildren = null; + Vlayout portalchildren = null; int currentColumnNo = 0; int noOfCols = 0; @@ -225,7 +225,7 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria int columnNo = dp.getColumnNo(); if(portalchildren == null || currentColumnNo != columnNo) { - portalchildren = new Portalchildren(); + portalchildren = new Vlayout(); portalLayout.appendChild(portalchildren); portalchildren.setWidth(width + "%"); portalchildren.setStyle("padding: 5px"); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/NavBar2Desktop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/NavBar2Desktop.java index ef0c297522..9709a852ef 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/NavBar2Desktop.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/NavBar2Desktop.java @@ -61,12 +61,12 @@ import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.OpenEvent; import org.zkoss.zk.ui.util.Clients; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.West; -import org.zkoss.zkmax.zul.Portalchildren; -import org.zkoss.zkmax.zul.Portallayout; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.Hlayout; +import org.zkoss.zul.North; +import org.zkoss.zul.Vlayout; +import org.zkoss.zul.West; import org.zkoss.zul.Div; import org.zkoss.zul.Html; import org.zkoss.zul.Panel; @@ -241,14 +241,14 @@ public class NavBar2Desktop extends TabbedDesktop implements MenuListener, Seria { homeTab.getChildren().clear(); - Portallayout portalLayout = new Portallayout(); + Hlayout portalLayout = new Hlayout(); portalLayout.setWidth("100%"); portalLayout.setHeight("100%"); portalLayout.setStyle("position: absolute; overflow: auto"); homeTab.appendChild(portalLayout); // Dashboard content - Portalchildren portalchildren = null; + Vlayout portalchildren = null; int currentColumnNo = 0; String sql = "SELECT COUNT(DISTINCT COLUMNNO) " @@ -281,7 +281,7 @@ public class NavBar2Desktop extends TabbedDesktop implements MenuListener, Seria int columnNo = rs.getInt(X_PA_DashboardContent.COLUMNNAME_ColumnNo); if(portalchildren == null || currentColumnNo != columnNo) { - portalchildren = new Portalchildren(); + portalchildren = new Vlayout(); portalLayout.appendChild(portalchildren); portalchildren.setWidth(width + "%"); portalchildren.setStyle("padding: 5px"); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/NavBarDesktop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/NavBarDesktop.java index 2fa446e6b3..c4a758f1b1 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/NavBarDesktop.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/NavBarDesktop.java @@ -63,12 +63,12 @@ import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.OpenEvent; import org.zkoss.zk.ui.util.Clients; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.West; -import org.zkoss.zkmax.zul.Portalchildren; -import org.zkoss.zkmax.zul.Portallayout; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.Hlayout; +import org.zkoss.zul.North; +import org.zkoss.zul.Vlayout; +import org.zkoss.zul.West; import org.zkoss.zul.Div; import org.zkoss.zul.Html; import org.zkoss.zul.Panel; @@ -243,14 +243,14 @@ public class NavBarDesktop extends TabbedDesktop implements MenuListener, Serial { homeTab.getChildren().clear(); - Portallayout portalLayout = new Portallayout(); + Hlayout portalLayout = new Hlayout(); portalLayout.setWidth("100%"); portalLayout.setHeight("100%"); portalLayout.setStyle("position: absolute; overflow: auto"); homeTab.appendChild(portalLayout); // Dashboard content - Portalchildren portalchildren = null; + Vlayout portalchildren = null; int currentColumnNo = 0; String sql = "SELECT COUNT(DISTINCT COLUMNNO) " @@ -284,7 +284,7 @@ public class NavBarDesktop extends TabbedDesktop implements MenuListener, Serial int columnNo = rs.getInt(X_PA_DashboardContent.COLUMNNAME_ColumnNo); if(portalchildren == null || currentColumnNo != columnNo) { - portalchildren = new Portalchildren(); + portalchildren = new Vlayout(); portalLayout.appendChild(portalchildren); portalchildren.setWidth(width + "%"); portalchildren.setStyle("padding: 5px"); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java index f1bf94c985..e2eef8720e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java @@ -58,7 +58,7 @@ public class WAccountEditor extends WEditor implements ContextMenuListener popupMenu = new WEditorPopupMenu(false, false, true); popupMenu.addMenuListener(this); addChangeLogMenu(popupMenu); - getComponent().setContext(popupMenu.getId()); + getComponent().setContext(popupMenu.getUuid()); } @Override diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDateEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDateEditor.java index 97201739ae..5f99c3fbaa 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDateEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDateEditor.java @@ -106,7 +106,7 @@ public class WDateEditor extends WEditor implements ContextMenuListener popupMenu = new WEditorPopupMenu(false, false, isShowPreference()); popupMenu.addMenuListener(this); addChangeLogMenu(popupMenu); - getComponent().setContext(popupMenu.getId()); + getComponent().setContext(popupMenu.getUuid()); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDatetimeEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDatetimeEditor.java index 5ea4aba08a..6b98b0ac50 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDatetimeEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDatetimeEditor.java @@ -100,7 +100,7 @@ public class WDatetimeEditor extends WEditor implements ContextMenuListener popupMenu = new WEditorPopupMenu(false, false, isShowPreference()); popupMenu.addMenuListener(this); addChangeLogMenu(popupMenu); - getComponent().setContext(popupMenu.getId()); + getComponent().setContext(popupMenu.getUuid()); } public void onEvent(Event event) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFilenameEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFilenameEditor.java index 4a3e05a252..d99f7196f7 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFilenameEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFilenameEditor.java @@ -130,18 +130,10 @@ public class WFilenameEditor extends WEditor // Show File Open Dialog Media file = null; - try - { - file = Fileupload.get(true); + file = Fileupload.get(true); - if (file == null) - return; - } - catch (InterruptedException e) - { - log.warning(e.getLocalizedMessage()); + if (file == null) return; - } // String fileName = System.getProperty("java.io.tmpdir") + System.getProperty("file.separator") + ; // File tempFile = new File(fileName); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java index 0551521ca0..2e57506480 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java @@ -87,7 +87,7 @@ public class WLocationEditor extends WEditor implements EventListener, PropertyC popupMenu = new WEditorPopupMenu(false, false, isShowPreference()); popupMenu.addMenuListener(this); addChangeLogMenu(popupMenu); - getComponent().setContext(popupMenu.getId()); + getComponent().setContext(popupMenu.getUuid()); } @Override diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java index 87a55b33e9..b92dd18421 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java @@ -114,7 +114,7 @@ public class WLocatorEditor extends WEditor implements EventListener, PropertyCh { popupMenu = new WEditorPopupMenu(true, true, isShowPreference()); addChangeLogMenu(popupMenu); - getComponent().setContext(popupMenu.getId()); + getComponent().setContext(popupMenu.getUuid()); } } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java index 1d6d679471..9381696dcd 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java @@ -122,7 +122,7 @@ public class WNumberEditor extends WEditor implements ContextMenuListener popupMenu = new WEditorPopupMenu(false, false, isShowPreference()); addChangeLogMenu(popupMenu); - getComponent().setContext(popupMenu.getId()); + getComponent().setContext(popupMenu.getUuid()); } /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java index b60935f710..e5e5a2531a 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java @@ -73,7 +73,7 @@ public class WPAttributeEditor extends WEditor implements ContextMenuListener // Popup popupMenu = new WEditorPopupMenu(true, false, false); - getComponent().getTextbox().setContext(popupMenu.getId()); + getComponent().getTextbox().setContext(popupMenu.getUuid()); addChangeLogMenu(popupMenu); getComponent().getTextbox().setReadonly(true); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java index 73411af9df..b62add961b 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java @@ -162,7 +162,7 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value getComponent().setButtonImage("/images/PickOpen10.png"); } - getComponent().getTextbox().setContext(popupMenu.getId()); + getComponent().getTextbox().setContext(popupMenu.getUuid()); addChangeLogMenu(popupMenu); return; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java index 436ea605c5..ef4d9c9c7e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java @@ -137,7 +137,7 @@ public class WStringEditor extends WEditor implements ContextMenuListener addTextEditorMenu(popupMenu); addChangeLogMenu(popupMenu); - getComponent().setContext(popupMenu.getId()); + getComponent().setContext(popupMenu.getUuid()); if (gridField.isAutocomplete()) { Combobox combo = (Combobox)getComponent(); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java index aaf0f257f3..a95f2e2837 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java @@ -144,7 +144,7 @@ ContextMenuListener, IZoomableEditor { popupMenu = new WEditorPopupMenu(zoom, true, isShowPreference()); addChangeLogMenu(popupMenu); - getComponent().setContext(popupMenu.getId()); + getComponent().setContext(popupMenu.getUuid()); } } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTimeEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTimeEditor.java index 612e126c8c..d534f247f9 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTimeEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTimeEditor.java @@ -101,7 +101,7 @@ public class WTimeEditor extends WEditor implements ContextMenuListener popupMenu = new WEditorPopupMenu(false, false, isShowPreference()); popupMenu.addMenuListener(this); addChangeLogMenu(popupMenu); - getComponent().setContext(popupMenu.getId()); + getComponent().setContext(popupMenu.getUuid()); } public void onEvent(Event event) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WUrlEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WUrlEditor.java index 8d4db8940b..86711d6953 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WUrlEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WUrlEditor.java @@ -42,7 +42,7 @@ public class WUrlEditor extends WEditor implements ContextMenuListener popupMenu = new WEditorPopupMenu(false, false, isShowPreference()); popupMenu.addMenuListener(this); addChangeLogMenu(popupMenu); - getComponent().setContext(popupMenu.getId()); + getComponent().setContext(popupMenu.getUuid()); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WYesNoEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WYesNoEditor.java index 0f309ad869..6618c07711 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WYesNoEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WYesNoEditor.java @@ -76,7 +76,7 @@ public class WYesNoEditor extends WEditor implements ContextMenuListener popupMenu = new WEditorPopupMenu(false, false, isShowPreference()); popupMenu.addMenuListener(this); addChangeLogMenu(popupMenu); - getComponent().setContext(popupMenu.getId()); + getComponent().setContext(popupMenu.getUuid()); } public void onEvent(Event event) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ZoomEvent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ZoomEvent.java index 2d00b07cea..c24087d64a 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ZoomEvent.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ZoomEvent.java @@ -23,7 +23,7 @@ import org.zkoss.zk.ui.event.Event; */ public class ZoomEvent extends Event { - private static final String EVENT_NAME = "onZoom"; + public final static String EVENT_NAME = "onZoom"; public ZoomEvent(Component target, Object data) { super(EVENT_NAME, target, data); 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 9192aaf3d7..517d03a6e4 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 @@ -41,9 +41,9 @@ import org.compiere.util.Msg; import org.compiere.util.ValueNamePair; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.South; import org.zkoss.zul.Div; public class WTranslationDialog extends TranslationController implements IFormController, EventListener { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java index 05f0f87e4b..d8bb211e85 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java @@ -68,14 +68,14 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.util.Clients; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.West; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.West; import org.zkoss.zul.Div; import org.zkoss.zul.Group; import org.zkoss.zul.Groupfoot; import org.zkoss.zul.Separator; -import org.zkoss.zul.SimpleTreeNode; +import org.zkoss.zul.DefaultTreeNode; import org.zkoss.zul.Space; import org.zkoss.zul.Treeitem; @@ -487,7 +487,7 @@ DataStatusListener, IADTabpanel, VetoableChangeListener label.addEventListener(Events.ON_CLICK, new ZoomListener((IZoomableEditor) editor)); } - label.setContext(popupMenu.getId()); + label.setContext(popupMenu.getUuid()); } } } @@ -813,11 +813,11 @@ DataStatusListener, IADTabpanel, VetoableChangeListener } else if (event.getTarget() == treePanel.getTree()) { Treeitem item = treePanel.getTree().getSelectedItem(); - navigateTo((SimpleTreeNode)item.getValue()); + navigateTo((DefaultTreeNode)item.getValue()); } } - private void navigateTo(SimpleTreeNode value) { + private void navigateTo(DefaultTreeNode value) { MTreeNode treeNode = (MTreeNode) value.getData(); // We Have a TreeNode int nodeID = treeNode.getNode_ID(); @@ -940,7 +940,7 @@ DataStatusListener, IADTabpanel, VetoableChangeListener SimpleTreeModel model = (SimpleTreeModel) treePanel.getTree().getModel(); if (treePanel.getTree().getSelectedItem() != null) { - SimpleTreeNode treeNode = (SimpleTreeNode) treePanel.getTree().getSelectedItem().getValue(); + DefaultTreeNode treeNode = (DefaultTreeNode) treePanel.getTree().getSelectedItem().getValue(); MTreeNode data = (MTreeNode) treeNode.getData(); if (data.getNode_ID() == recordId) { model.removeNode(treeNode); @@ -948,7 +948,7 @@ DataStatusListener, IADTabpanel, VetoableChangeListener } } - SimpleTreeNode treeNode = model.find(null, recordId); + DefaultTreeNode treeNode = model.find(null, recordId); if (treeNode != null) { model.removeNode(treeNode); } @@ -962,13 +962,13 @@ DataStatusListener, IADTabpanel, VetoableChangeListener String imageIndicator = (String)gridTab.getValue("Action"); // Menu - Action // SimpleTreeModel model = (SimpleTreeModel) treePanel.getTree().getModel(); - SimpleTreeNode treeNode = model.getRoot(); + DefaultTreeNode treeNode = model.getRoot(); MTreeNode root = (MTreeNode) treeNode.getData(); MTreeNode node = new MTreeNode (gridTab.getRecord_ID(), 0, name, description, root.getNode_ID(), summary, imageIndicator, false, null); - SimpleTreeNode newNode = new SimpleTreeNode(node, new ArrayList()); + DefaultTreeNode newNode = new DefaultTreeNode(node, new ArrayList()); model.addNode(newNode); - int[] path = model.getPath(model.getRoot(), newNode); + int[] path = model.getPath(newNode); Treeitem ti = treePanel.getTree().renderItemByPath(path); treePanel.getTree().setSelectedItem(ti); } @@ -978,15 +978,15 @@ DataStatusListener, IADTabpanel, VetoableChangeListener if (recordId <= 0) return; if (treePanel.getTree().getSelectedItem() != null) { - SimpleTreeNode treeNode = (SimpleTreeNode) treePanel.getTree().getSelectedItem().getValue(); + DefaultTreeNode treeNode = (DefaultTreeNode) treePanel.getTree().getSelectedItem().getValue(); MTreeNode data = (MTreeNode) treeNode.getData(); if (data.getNode_ID() == recordId) return; } SimpleTreeModel model = (SimpleTreeModel) treePanel.getTree().getModel(); - SimpleTreeNode treeNode = model.find(null, recordId); + DefaultTreeNode treeNode = model.find(null, recordId); if (treeNode != null) { - int[] path = model.getPath(model.getRoot(), treeNode); + int[] path = model.getPath(treeNode); Treeitem ti = treePanel.getTree().renderItemByPath(path); treePanel.getTree().setSelectedItem(ti); } else { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADWindowPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADWindowPanel.java index 0f8f8b1c6d..874e78d6b2 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADWindowPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADWindowPanel.java @@ -47,12 +47,12 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.KeyEvent; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.East; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; -import org.zkoss.zkex.zul.West; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.East; +import org.zkoss.zul.North; +import org.zkoss.zul.South; +import org.zkoss.zul.West; import org.zkoss.zul.Tab; /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java index 81538d14d9..13099c2540 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java @@ -1850,12 +1850,8 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To AD_Process_ID,table_ID, record_ID, true); if (dialog.isValid()) { dialog.setPosition("center"); - try { dialog.setPage(this.getComponent().getPage()); dialog.doModal(); - } - catch (InterruptedException e) { - } } } @@ -2325,14 +2321,14 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To m_uiLocked = true; if (Executions.getCurrent() != null) - Clients.showBusy(null, true); + Clients.showBusy(null); else { try { //acquire desktop, 2 second timeout Executions.activate(getComponent().getDesktop(), 2000); try { - Clients.showBusy(null, true); + Clients.showBusy(null); } catch(Error ex){ throw ex; } finally{ @@ -2364,7 +2360,7 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To { updateUI(pi); } - Clients.showBusy(null, false); + Clients.clearBusy(null); } else { @@ -2376,7 +2372,7 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To { updateUI(pi); } - Clients.showBusy(null, false); + Clients.clearBusy(null); } catch(Error ex){ throw ex; } finally{ diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HeaderPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HeaderPanel.java index 115d9eb0f4..8c248a8419 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HeaderPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HeaderPanel.java @@ -24,9 +24,9 @@ import org.adempiere.webui.window.AboutWindow; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.West; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.West; import org.zkoss.zul.Image; import org.zkoss.zul.Vbox; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssetPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssetPanel.java index 1c46119ec6..be15e829e8 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssetPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssetPanel.java @@ -42,10 +42,10 @@ import org.compiere.util.Env; import org.compiere.util.Msg; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Div; import org.zkoss.zul.Separator; import org.zkoss.zul.Vbox; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssignmentPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssignmentPanel.java index 8508bf6560..f705316b40 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssignmentPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssignmentPanel.java @@ -47,10 +47,10 @@ import org.compiere.util.Msg; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Div; import org.zkoss.zul.Separator; import org.zkoss.zul.Vbox; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java index 54036339c1..0b455c2620 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java @@ -42,10 +42,10 @@ import org.compiere.util.Msg; import org.compiere.util.Util; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Div; import org.zkoss.zul.Separator; import org.zkoss.zul.Vbox; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoCashLinePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoCashLinePanel.java index 19f70fb779..28ed3d24b3 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoCashLinePanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoCashLinePanel.java @@ -46,10 +46,10 @@ import org.compiere.util.Msg; import org.compiere.util.Util; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Div; import org.zkoss.zul.Hbox; import org.zkoss.zul.Separator; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java index f4b9d4d05d..ec56c307bc 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java @@ -41,10 +41,10 @@ import org.compiere.util.Env; import org.compiere.util.Msg; import org.compiere.util.Util; import org.zkoss.zk.ui.event.EventListener; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Div; import org.zkoss.zul.Separator; import org.zkoss.zul.Vbox; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java index 9ebeed4fd1..90d62b5cf1 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java @@ -46,10 +46,10 @@ import org.compiere.util.Msg; import org.compiere.util.Util; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Div; import org.zkoss.zul.Hbox; import org.zkoss.zul.Separator; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java index 808dea557e..b84306f9d5 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java @@ -48,10 +48,10 @@ import org.compiere.util.KeyNamePair; import org.compiere.util.Msg; import org.compiere.util.Util; import org.zkoss.zk.ui.WrongValueException; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Div; import org.zkoss.zul.Hbox; import org.zkoss.zul.Separator; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java index 1ef1a237fb..af29d1811f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java @@ -47,10 +47,10 @@ import org.compiere.util.Env; import org.compiere.util.Msg; import org.compiere.util.Util; import org.zkoss.zk.ui.WrongValueException; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Div; import org.zkoss.zul.Hbox; import org.zkoss.zul.Separator; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributeInstancePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributeInstancePanel.java index 5693c320e6..c0f776b4d3 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributeInstancePanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributeInstancePanel.java @@ -33,10 +33,10 @@ import org.compiere.util.KeyNamePair; import org.compiere.util.Msg; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Div; /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java index 058c0ad897..f5a0b7b15b 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java @@ -1290,4 +1290,10 @@ public abstract class InfoPanel extends Window implements EventListener, WTableM } } } + + @Override + public String getSortDirection(Comparator cmpr) { + return "natural"; + } + } // Info diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java index b238b2a0c3..e8ffcfaea5 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java @@ -47,10 +47,10 @@ import org.compiere.util.Msg; import org.compiere.util.Util; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Div; import org.zkoss.zul.Hbox; import org.zkoss.zul.Separator; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java index 0901b9bf79..4d4f7981c2 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java @@ -39,6 +39,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; import java.util.ArrayList; +import java.util.Comparator; import java.util.Vector; import java.util.logging.Level; @@ -77,10 +78,10 @@ import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; /** * Search Product and return selection @@ -1422,5 +1423,4 @@ public class InfoProductPanel extends InfoPanel implements EventListener return M_AttributeSet_ID; } - } // InfoProduct diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java index f13d73a0cb..5bfbbc9fe7 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java @@ -45,10 +45,10 @@ import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; /** * Price History for BPartner/Product diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java index c588439082..9cd3f63018 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java @@ -434,7 +434,8 @@ public class LoginPanel extends Window implements EventListener Locales.setThreadLocal(language.getLocale()); - Clients.response("zkLocaleJavaScript", new AuScript(null, ZkFns.outLocaleJavaScript())); + //TODO: Replace with zk6 api +// Clients.response("zkLocaleJavaScript", new AuScript(null, ZkFns.outLocaleJavaScript())); String timeoutText = getUpdateTimeoutTextScript(); if (!Strings.isEmpty(timeoutText)) Clients.response("zkLocaleJavaScript2", new AuScript(null, timeoutText)); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java index 55807c1c6c..a79becf081 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java @@ -36,7 +36,7 @@ import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.util.Clients; import org.zkoss.zul.Div; -import org.zkoss.zul.SimpleTreeNode; +import org.zkoss.zul.DefaultTreeNode; import org.zkoss.zul.Tree; import org.zkoss.zul.Treeitem; import org.zkoss.zul.event.TreeDataEvent; @@ -141,7 +141,7 @@ public class TreeSearchPanel extends Panel implements EventListener, TreeDataLis treeNodeItemMap.put(key, treeItem); } - private void addTreeItem(SimpleTreeNode node) { + private void addTreeItem(DefaultTreeNode node) { Object data = node.getData(); if (data instanceof MTreeNode) { MTreeNode mNode = (MTreeNode) data; @@ -173,7 +173,7 @@ public class TreeSearchPanel extends Panel implements EventListener, TreeDataLis }); } else { TreeUtils.traverse(tree.getModel(), new TreeNodeAction() { - public void run(SimpleTreeNode treeNode) { + public void run(DefaultTreeNode treeNode) { addTreeItem(treeNode); } }); @@ -193,9 +193,9 @@ public class TreeSearchPanel extends Panel implements EventListener, TreeDataLis treeValues[i] = treeItem.getLabel(); treeDescription[i] = treeItem.getTooltiptext(); } - else if (value instanceof SimpleTreeNode) + else if (value instanceof DefaultTreeNode) { - SimpleTreeNode sNode = (SimpleTreeNode) value; + DefaultTreeNode sNode = (DefaultTreeNode) value; MTreeNode mNode = (MTreeNode) sNode.getData(); treeValues[i] = mNode.getName(); treeDescription[i] = mNode.getDescription(); @@ -232,15 +232,15 @@ public class TreeSearchPanel extends Panel implements EventListener, TreeDataLis } else if (node instanceof Treeitem) { treeItem = (Treeitem) node; } else { - SimpleTreeNode sNode = (SimpleTreeNode) node; - int[] path = tree.getModel().getPath(tree.getModel().getRoot(), sNode); + DefaultTreeNode sNode = (DefaultTreeNode) node; + int[] path = tree.getModel().getPath(sNode); treeItem = tree.renderItemByPath(path); tree.setSelectedItem(treeItem); } if (treeItem != null) { select(treeItem); - Clients.showBusy(Msg.getMsg(Env.getCtx(), "Loading"), true); + Clients.showBusy(Msg.getMsg(Env.getCtx(), "Loading")); Events.echoEvent("onPostSelect", this, null); } } @@ -250,7 +250,7 @@ public class TreeSearchPanel extends Panel implements EventListener, TreeDataLis * don't call this directly, use internally for post selection event */ public void onPostSelect() { - Clients.showBusy(null, false); + Clients.clearBusy(); Event event = null; if (eventToFire.equals(Events.ON_CLICK)) event = new Event(Events.ON_CLICK, tree.getSelectedItem().getTreerow()); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java index 24a7e0b93a..27a2215105 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java @@ -46,10 +46,10 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.util.Clients; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Div; import org.zkoss.zul.Filedownload; import org.zkoss.zul.Fileupload; @@ -513,25 +513,18 @@ public class WAttachment extends Window implements EventListener Media media = null; - try - { - media = Fileupload.get(true); + media = Fileupload.get(true); - if (media != null) - { -// pdfViewer.setContent(media); - ; - } - else - { - preview.setVisible(true); - preview.invalidate(); - return; - } - } - catch (InterruptedException e) + if (media != null) { - log.log(Level.WARNING, e.getLocalizedMessage(), e); +// pdfViewer.setContent(media); + ; + } + else + { + preview.setVisible(true); + preview.invalidate(); + return; } String fileName = media.getName(); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WSchedule.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WSchedule.java index 808d1141d6..4cdf1b8040 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WSchedule.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WSchedule.java @@ -136,7 +136,6 @@ public class WSchedule extends Panel implements EventListener dayBand.setIntervalPixels(100); dayBand.setSyncWith(hourBand.getId()); dayBand.setTimeZone(TimeZone.getDefault()); - dayBand.setShowEventText(false); // listening band scroll event dayBand.addEventListener("onBandScroll", this); @@ -149,7 +148,6 @@ public class WSchedule extends Panel implements EventListener mthBand.setIntervalPixels(150); mthBand.setSyncWith(dayBand.getId()); mthBand.setTimeZone(TimeZone.getDefault()); - mthBand.setShowEventText(false); } /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java index a4375b0be4..ce3c471f58 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java @@ -23,8 +23,8 @@ import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; /** * diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java index ea2efb21e2..8f9fd43ba3 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java @@ -359,7 +359,7 @@ public class InvoicePrint extends SvrProcess File outFile = File.createTempFile("InvoicePrint", ".pdf"); AEnv.mergePdf(pdfList, outFile); - Clients.showBusy(null, false); + Clients.showBusy(null, null); Window win = new SimplePDFViewer(this.getName(), new FileInputStream(outFile)); win.setAttribute(Window.MODE_KEY, Window.MODE_HIGHLIGHTED); SessionManager.getAppDesktop().showWindow(win, "center"); @@ -367,7 +367,7 @@ public class InvoicePrint extends SvrProcess log.log(Level.SEVERE, e.getLocalizedMessage(), e); } } else if (pdfList.size() > 0) { - Clients.showBusy(null, false); + Clients.clearBusy(null); try { Window win = new SimplePDFViewer(this.getName(), new FileInputStream(pdfList.get(0))); win.setAttribute(Window.MODE_KEY, Window.MODE_HIGHLIGHTED); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/TreeNodeAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/TreeNodeAction.java index 292047377f..22f782b295 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/TreeNodeAction.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/TreeNodeAction.java @@ -13,7 +13,7 @@ *****************************************************************************/ package org.adempiere.webui.util; -import org.zkoss.zul.SimpleTreeNode; +import org.zkoss.zul.DefaultTreeNode; /** * @@ -26,5 +26,5 @@ public interface TreeNodeAction { * * @param treeNode */ - public void run(SimpleTreeNode treeNode); + public void run(DefaultTreeNode treeNode); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/TreeUtils.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/TreeUtils.java index 5956134dd1..50879ebf37 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/TreeUtils.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/TreeUtils.java @@ -15,7 +15,7 @@ package org.adempiere.webui.util; import java.util.List; -import org.zkoss.zul.SimpleTreeNode; +import org.zkoss.zul.DefaultTreeNode; import org.zkoss.zul.Tree; import org.zkoss.zul.TreeModel; import org.zkoss.zul.Treechildren; @@ -120,8 +120,8 @@ public class TreeUtils { int count = model.getChildCount(parent); for(int i = 0; i < count; i++) { Object child = model.getChild(parent, i); - if (child instanceof SimpleTreeNode) { - action.run((SimpleTreeNode) child); + if (child instanceof DefaultTreeNode) { + action.run((DefaultTreeNode) child); } traverse(model, child, action); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java index c8a59e63ab..45b65e3213 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java @@ -82,10 +82,10 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.util.Clients; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Comboitem; import org.zkoss.zul.Hbox; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java index 8914c56c67..3531e881fa 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java @@ -56,10 +56,10 @@ import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Caption; import org.zkoss.zul.Div; import org.zkoss.zul.Groupbox; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAssignmentDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAssignmentDialog.java index 7dd5121b23..3931837dfb 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAssignmentDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAssignmentDialog.java @@ -55,6 +55,7 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zul.Div; +import org.zkoss.zul.Listitem; import org.zkoss.zul.Timebox; /** @@ -222,7 +223,7 @@ public class WAssignmentDialog extends Window implements EventListener // Set Resource int S_Resource_ID = m_mAssignment.getS_Resource_ID(); - for (ListItem item : fResource.getItems()) { + for (Listitem item : fResource.getItems()) { if ( (Integer)item.getValue() == S_Resource_ID) { fResource.setSelectedItem(item); break; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java index cceca83829..6eb2576e0a 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java @@ -37,9 +37,9 @@ import org.compiere.util.*; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.South; import org.zkoss.zul.Detail; import org.zkoss.zul.Div; import org.zkoss.zul.Space; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java index 24a623fd00..a25b0975f2 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java @@ -46,9 +46,9 @@ import org.compiere.util.Env; import org.compiere.util.Msg; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.South; import org.zkoss.zul.Div; import org.zkoss.zul.Separator; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java index 3dfca762b6..988c1648aa 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java @@ -46,9 +46,9 @@ import org.compiere.util.NamePair; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.South; import org.zkoss.zul.Listhead; import org.zkoss.zul.Listheader; import org.zkoss.zul.Menuitem; 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 fc2037edb4..983f87f53b 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 @@ -34,10 +34,10 @@ import org.zkoss.util.media.Media; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +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.Separator; @@ -194,18 +194,10 @@ public class WImageDialog extends Window implements EventListener // Show File Open Dialog Media imageFile = null; - try - { - imageFile = Fileupload.get(); - - if (imageFile == null) - return; - } - catch (InterruptedException e) - { - log.warning(e.getLocalizedMessage()); + imageFile = Fileupload.get(); + + if (imageFile == null) return; - } String fileName = imageFile.getName(); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java index 545b9fe90e..6bbbb6d1f8 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java @@ -33,10 +33,10 @@ import org.zkoss.util.media.Media; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Filedownload; import org.zkoss.zul.Fileupload; import org.zkoss.zul.Hbox; @@ -319,17 +319,10 @@ public class WMediaDialog extends Window implements EventListener Media media = null; - try - { - media = Fileupload.get(); - - if (media == null) - return; - } - catch (InterruptedException e) - { - e.printStackTrace(); - } + media = Fileupload.get(); + + if (media == null) + return; String fileName = media.getName(); log.config(fileName); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java index 6b3b61d566..ea98859e96 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java @@ -61,9 +61,9 @@ import org.zkoss.zk.ui.HtmlBasedComponent; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.South; import org.zkoss.zul.Menuitem; import org.zkoss.zul.Menupopup; import org.zkoss.zul.Space; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeInstance.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeInstance.java index a3d3f554f8..5e070aa9d3 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeInstance.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeInstance.java @@ -37,10 +37,10 @@ import org.compiere.util.Msg; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Hbox; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java index d6168eea01..27c07167ce 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java @@ -49,10 +49,10 @@ import org.zkoss.zhtml.Text; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; +import org.zkoss.zul.South; import org.zkoss.zul.Div; import org.zkoss.zul.Listhead; import org.zkoss.zul.Listheader; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTask.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTask.java index b0e0dc198b..8431c5b335 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTask.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTask.java @@ -32,9 +32,9 @@ import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.South; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.South; import org.zkoss.zul.Div; import org.zkoss.zul.Html; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java index 4626896e8c..2d9850e286 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java @@ -22,7 +22,7 @@ import org.adempiere.webui.component.Tabs; import org.adempiere.webui.component.Textbox; import org.adempiere.webui.component.VerticalBox; import org.adempiere.webui.component.Window; -import org.zkforge.fckez.FCKeditor; +import org.zkforge.ckez.*; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; @@ -47,7 +47,7 @@ public class WTextEditorDialog extends Window implements EventListener{ private boolean cancelled; private Tabbox tabbox; private Textbox textBox; - private FCKeditor editor; + private CKeditor editor; private Label status; /** @@ -99,7 +99,7 @@ public class WTextEditorDialog extends Window implements EventListener{ tabPanel = new Tabpanel(); tabPanels.appendChild(tabPanel); if (editable) { - editor = new FCKeditor(); + editor = new CKeditor(); tabPanel.appendChild(editor); editor.setWidth("700px"); editor.setHeight("500px"); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java index 64aad3cf21..9cb916e997 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java @@ -31,9 +31,9 @@ import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; import org.zkoss.zul.Iframe; import org.zkoss.zul.Listitem; import org.zkoss.zul.Tab; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java index 8a49662237..8e9e67cad5 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java @@ -67,9 +67,9 @@ import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; +import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Center; +import org.zkoss.zul.North; import org.zkoss.zul.Div; import org.zkoss.zul.Filedownload; import org.zkoss.zul.Hbox; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/zkoss/zkmax/zul/render/Combobox2Default.java b/org.adempiere.ui.zk/WEB-INF/src/org/zkoss/zkmax/zul/render/Combobox2Default.java deleted file mode 100644 index 0973df423c..0000000000 --- a/org.adempiere.ui.zk/WEB-INF/src/org/zkoss/zkmax/zul/render/Combobox2Default.java +++ /dev/null @@ -1,91 +0,0 @@ -/* Combobox2Default.java - -{{IS_NOTE - Purpose: - - Description: - - History: - Jun 6, 2008 8:57:53 AM , Created by jumperchen -}}IS_NOTE - -Copyright (C) 2008 Potix Corporation. All Rights Reserved. - -{{IS_RIGHT - This program is distributed under GPL Version 2.0 in the hope that - it will be useful, but WITHOUT ANY WARRANTY. -}}IS_RIGHT -*/ -package org.zkoss.zkmax.zul.render; - -import java.io.IOException; -import java.io.Writer; - -import org.adempiere.webui.apps.AEnv; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Execution; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.render.ComponentRenderer; -import org.zkoss.zk.ui.render.SmartWriter; -import org.zkoss.zul.Combobox; - -/** - * {@link Combobox}'s default mold. - * - * @author jumperchen - * - * @since 3.5.0 - * - * @author hengsin - * modify default zk layout for combobox - */ -public class Combobox2Default implements ComponentRenderer { - public void render(Component comp, Writer out) throws IOException { - final SmartWriter wh = new SmartWriter(out); - final Combobox self = (Combobox) comp; - final String uuid = self.getUuid(); - final String zcls = self.getZclass(); - final Execution exec = Executions.getCurrent(); - - String tableStyle = AEnv.isInternetExplorer() ? "display:inline" : "display:inline-block"; - String inputAttrs = self.getInnerAttrs(); - if (inputAttrs.indexOf("style") >= 0) { - inputAttrs = inputAttrs.substring(0, inputAttrs.indexOf("style")); - } - inputAttrs = inputAttrs.trim() + " style='width: 100%'"; - wh.write("") - .write("") - .write(""); - if (self.getWidth() != null && self.getWidth().trim().length() > 0 && !"auto".equals(self.getWidth())) - { - wh.write("
"); - } - else - { - wh.write(""); - } - wh.write("
") - .write("") - .writeChildren(self) - .write("
"); - } -} diff --git a/org.adempiere.ui.zk/WEB-INF/tld/web/core.dsp.tld b/org.adempiere.ui.zk/WEB-INF/tld/web/core.dsp.tld index a548065096..df285fe9e1 100755 --- a/org.adempiere.ui.zk/WEB-INF/tld/web/core.dsp.tld +++ b/org.adempiere.ui.zk/WEB-INF/tld/web/core.dsp.tld @@ -186,7 +186,40 @@ Copyright (C) 2005 Potix Corporation. All Rights Reserved. java.lang.Object new_(java.lang.Object) Instantiates the specified class. - The argument could be either a string (class name) or a Class instance. + The parameter could be either a string (class name) or a Class instance. + + + + new1 + org.zkoss.xel.fn.CommonFns + java.lang.Object new_(java.lang.Object, java.lang.Object) + + Instantiates the specified class and argument. + The first parameter could be either a string (class name) or a Class instance. + The second parameter is the argument passed to the constructor. + + + + new2 + org.zkoss.xel.fn.CommonFns + java.lang.Object new_(java.lang.Object, java.lang.Object, java.lang.Object) + + Instantiates the specified class and two arguments. + The first parameter could be either a string (class name) or a Class instance. + The second parameter is the first argument passed to the constructor. + The third parameter is the second argument passed to the constructor. + + + + new3 + org.zkoss.xel.fn.CommonFns + java.lang.Object new_(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object) + + Instantiates the specified class and three arguments. + The first parameter could be either a string (class name) or a Class instance. + The second parameter is the first argument passed to the constructor. + The third parameter is the second argument passed to the constructor. + The fourth parameter is the third argument passed to the constructor. @@ -198,14 +231,6 @@ Copyright (C) 2005 Potix Corporation. All Rights Reserved. Returns the library property. - - getProperty - org.zkoss.lang.Library - java.lang.String getProperty(java.lang.String) - - Returns the library property. - - @@ -270,6 +295,107 @@ Copyright (C) 2005 Potix Corporation. All Rights Reserved. Replaces all occurenances of the second argument with the third argument. + + toLowerCase + org.zkoss.xel.fn.StringFns + + java.lang.String toLowerCase(java.lang.String) + + + Converts to the lower case. + + + + toUpperCase + org.zkoss.xel.fn.StringFns + + java.lang.String toUpperCase(java.lang.String) + + + Converts to the upper case. + + + + trim + org.zkoss.xel.fn.StringFns + + java.lang.String trim(java.lang.String) + + + Trims the whitespaces. + + + + split + org.zkoss.xel.fn.StringFns + + java.lang.String[] split(java.lang.String, java.lang.String) + + + Splits a string into an array of strings based on the given separator. + + + + join + org.zkoss.xel.fn.StringFns + + java.lang.String join(java.lang.Object[], java.lang.String) + + + Joins an array of strings into a single string based on the given separator. + + + + startsWith + org.zkoss.xel.fn.StringFns + + boolean startsWith(java.lang.String, java.lang.String) + + + Returns whether a string starts with another. + + + + endsWith + org.zkoss.xel.fn.StringFns + + boolean endsWith(java.lang.String, java.lang.String) + + + Returns whether a string starts with another. + + + + substring + org.zkoss.xel.fn.StringFns + + java.lang.String substring(java.lang.String, int from, int to) + + + Returns the substring. + + + + + indexOf + org.zkoss.xel.fn.CommonFns + + int indexOf(java.lang.Object, java.lang.Object) + + + Returns the index of the given element. + + + + lastIndexOf + org.zkoss.xel.fn.CommonFns + + int lastIndexOf(java.lang.Object, java.lang.Object) + + + Returns the index of the given element. + + l @@ -289,6 +415,27 @@ Copyright (C) 2005 Potix Corporation. All Rights Reserved. + + + + + formatDate + org.zkoss.xel.fn.CommonFns + java.lang.String formatDate(java.util.Date, java.lang.String) + + Returns the formatted time string. + + + + parseDate + org.zkoss.xel.fn.CommonFns + java.util.Date parseDate(java.lang.String, java.lang.String) + + Returns A Date parsed from the string. + + + + @@ -330,6 +477,19 @@ Copyright (C) 2005 Potix Corporation. All Rights Reserved. Encoding a string to be used as a query name or value. + + encodeThemeURL + org.zkoss.web.fn.ServletFns + + java.lang.String encodeThemeURL(java.lang.String) + + + Encoding URL to theme specific prefix the context path and to provide + session info, if necessary + If URL contains "*", it is resolved to the current Locale and + the browser code. + + escapeXML @@ -349,17 +509,15 @@ Copyright (C) 2005 Potix Corporation. All Rights Reserved. boolean isBrowser(java.lang.String) - + - Note: "ie6-" means Internet Explorer 6 only; not Internet Explorer 7 - or other. - + @param type the type of the browser. + The syntax: <browser-name>[<version-number>];[-].
+ For example, ie9, ios and ie6-. + And, ie9 means Internet Explorer 9 and later, while + ie6- means Internet Explorer 6 (not prior, nor later). + ]]> isExplorer diff --git a/org.adempiere.ui.zk/WEB-INF/tld/zk/core.dsp.tld b/org.adempiere.ui.zk/WEB-INF/tld/zk/core.dsp.tld index dda8b81018..e54d23648f 100755 --- a/org.adempiere.ui.zk/WEB-INF/tld/zk/core.dsp.tld +++ b/org.adempiere.ui.zk/WEB-INF/tld/zk/core.dsp.tld @@ -14,128 +14,17 @@ Copyright (C) 2005 Potix Corporation. All Rights Reserved. http://www.zkoss.org/dsp/zk/core - Methods and actions for ZK in DSP/ZUML + Methods and actions of ZK utilities - - ZkFns - org.zkoss.zk.fn.ZkFns - - - redraw - org.zkoss.zk.fn.ZkFns - - void redraw(org.zkoss.zk.ui.Component, java.io.Writer) - - - Redraw the specified component. - - - - - outResponseJavaScripts - org.zkoss.zk.fn.ZkFns - - java.lang.String outResponseJavaScripts(java.util.Collection); - - - Returns javascript to handle the specified responses. - - - - - outLangJavaScripts - org.zkoss.zk.fn.ZkFns - - java.lang.String outLangJavaScripts(java.lang.String) - - - Returns HTML tags to include all JavaScripts used by all languages. - The argument is ignored (since 3.5.0; reserved for backward compatible). - - - - outLangStyleSheets - org.zkoss.zk.fn.ZkFns - - java.lang.String outLangStyleSheets() - - - Returns HTML tags to include all style sheets used by all languages. - Note: it cannot be called without current execution. In other words, - it is used to design component templates. - - - - outHtmlUnavailable - org.zkoss.zk.fn.ZkFns - - java.lang.String outHtmlUnavailable(org.zkoss.zk.ui.Page) - - - Generates the unavailable message in HTML tags, if any. - - - - outHeaders - org.zkoss.zk.fn.ZkFns - - java.lang.String outHeaders(org.zkoss.zk.ui.Page, boolean) - - - Returns the content that will be placed inside the header element - of the specified page. - - - - outRootAttributes - org.zkoss.zk.fn.ZkFns - - java.lang.String outRootAttributes(org.zkoss.zk.ui.Page) - - - Returns the content that will be placed as the attributes of - the root element of the specified page. - - - - outContentType - org.zkoss.zk.fn.ZkFns - - java.lang.String outContentType(org.zkoss.zk.ui.Page) - - - Returns the content type. - - - - outDocType - org.zkoss.zk.fn.ZkFns - - java.lang.String outDocType(org.zkoss.zk.ui.Page) - - - Returns the doc type. - - - - outFirstLine - org.zkoss.zk.fn.ZkFns - - java.lang.String outFirstLine(org.zkoss.zk.ui.Page) - - - Returns the first line to be generated to the output. - - - + toAbsoluteURI org.zkoss.zk.fn.ZkFns @@ -148,70 +37,6 @@ Copyright (C) 2005 Potix Corporation. All Rights Reserved. - - outPageAttrs - org.zkoss.zk.fn.ZkFns - - java.lang.String outPageAttrs(org.zkoss.zk.ui.Page) - - - Returns the attributes to render a page. - - - - - outZkHtmlTags - org.zkoss.zk.fn.ZkFns - - java.lang.String outZkHtmlTags() - - - Returns the ZK specific HTML tags, if not generated yet. - - - - outZkHeadHtmlTags - org.zkoss.zk.fn.ZkFns - - java.lang.String outZkHeadHtmlTags(org.zkoss.zk.ui.Page) - - - Returns the ZK specific HTML tags including the headers defined in the page, - if not generated yet - - - - - noCSSAttrs - org.zkoss.zk.fn.ZkFns - - java.lang.String noCSSAttrs(java.lang.String) - - - Removes the class and style attributes from the specified one. - - - - outCSSAttrs - org.zkoss.zk.fn.ZkFns - - java.lang.String outCSSAttrs(java.lang.String) - - - Returns only the class and style attributes from the specified one. - - - - - outLocaleJavaScript - org.zkoss.zk.fn.DspFns - - java.lang.String outLocaleJavaScript() - - - Returns date relevant labels in JavaScript. - - outDeviceStyleSheets org.zkoss.zk.fn.DspFns @@ -220,8 +45,35 @@ Copyright (C) 2005 Potix Corporation. All Rights Reserved. Returns HTML tags to include all style sheets used by the specified device. - Note: unlike outLangStyleSheets, it can be called without current execution. - @param deviceType the device type. If null, "ajax" is assumed. + This method is designed to use with DSP pages. + @param deviceType the device type. If null, ajax is assumed. + + + + outDeviceCSSContent + org.zkoss.zk.fn.DspFns + + java.lang.String outDeviceCSSContent(java.lang.String) + + + Generates and returns the complete CSS content of all components in the + specified device. + This method is designed to use with DSP pages. + @param deviceType the device type. If null, ajax is assumed. + + + + outZkHtmlTags + org.zkoss.zk.fn.DspFns + + java.lang.String outZkHtmlTags(java.lang.String) + + + Generates and returns the ZK specific HTML tags for the HTML output. + If you want to generate HTML HEAD and BODY tags by yourself, you + can invoke this method in the HTML HEAD tag. + This method is designed to use with DSP pages. + @param deviceType the device type. If null, ajax is assumed. diff --git a/org.adempiere.ui.zk/WEB-INF/tld/zul/core.dsp.tld b/org.adempiere.ui.zk/WEB-INF/tld/zul/core.dsp.tld deleted file mode 100755 index de491972d8..0000000000 --- a/org.adempiere.ui.zk/WEB-INF/tld/zul/core.dsp.tld +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - http://www.zkoss.org/dsp/zul/core - - Methods and actions for ZUL in DSP/ZUML - - - - - - - ZulFns - org.zkoss.zul.fn.ZulFns - - - - - - - getColAttrs - org.zkoss.zul.fn.ZulFns - - java.lang.String getColAttrs(org.zkoss.zul.Row, int) - - - Returns the attribute used for the cell of the specified row and index. - - - - getBoxChildOuterAttrs - org.zkoss.zul.fn.ZulFns - - java.lang.String getBoxChildOuterAttrs(org.zkoss.zk.ui.Component) - - - Returns the inner attributes used for the cell of the specified child - when it is placed inside of hbox/vbox. - - - - getBoxChildInnerAttrs - org.zkoss.zul.fn.ZulFns - - java.lang.String getBoxChildInnerAttrs(org.zkoss.zk.ui.Component) - - - Returns the outer attributes used for the cell of the specified child - when it is placed inside of hbox/vbox. - - - - setStripeClass - org.zkoss.zul.fn.ZulFns - - void setStripeClass(org.zkoss.zk.ui.Component) - - - Sets the stripe CSS for each row. - - - - resetStripeClass - org.zkoss.zul.fn.ZulFns - - void resetStripeClass(org.zkoss.zk.ui.Component) - - - Resets the stripe CSS for each row. - - - - shallVisitTree - org.zkoss.zul.fn.ZulFns - - boolean shallVisitTree(org.zkoss.zul.Tree, org.zkoss.zk.ui.Component) - - - Returns whether the specified tree should be visited. - - - - shallRenderTree - org.zkoss.zul.fn.ZulFns - - boolean shallRenderTree(org.zkoss.zul.Tree) - - - Returns whether the specified tree shall be rendered. - - - - clearTreeRenderInfo - org.zkoss.zul.fn.ZulFns - - void clearTreeRenderInfo(org.zkoss.zul.Tree) - - - Clears up the info stored in attributes that are used to render - a tree in the paging mold. - - - diff --git a/org.adempiere.ui.zk/WEB-INF/xsd/zul.xsd b/org.adempiere.ui.zk/WEB-INF/xsd/zul.xsd index 4a6e545103..1f5a8198ef 100644 --- a/org.adempiere.ui.zk/WEB-INF/xsd/zul.xsd +++ b/org.adempiere.ui.zk/WEB-INF/xsd/zul.xsd @@ -35,6 +35,12 @@ + + + + + + @@ -93,6 +99,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -114,21 +154,6 @@ - - - - - - - - - - - - - - - @@ -226,6 +251,20 @@ + + + + + + + + + + + + + + @@ -393,7 +432,10 @@ + + + @@ -404,17 +446,20 @@ - - + + - + + + + + - @@ -426,6 +471,7 @@ + @@ -440,6 +486,11 @@ + + + + + @@ -448,15 +499,21 @@ - + - + + + + + + + @@ -471,26 +528,40 @@ + + + + + + + + + - + + + + + + @@ -504,18 +575,21 @@ + + + @@ -523,6 +597,7 @@ + @@ -531,26 +606,40 @@ + + + + + + + + + - + + + + + + @@ -563,12 +652,15 @@ + + + @@ -582,6 +674,7 @@ + @@ -592,12 +685,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + @@ -690,7 +834,8 @@ - + + @@ -707,6 +852,7 @@ + @@ -715,10 +861,11 @@ + - + @@ -729,17 +876,49 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -760,10 +939,6 @@ - - - - @@ -778,7 +953,7 @@ - + @@ -792,16 +967,27 @@ - + - + + + + + + + + + + + + @@ -845,6 +1031,7 @@ + @@ -869,6 +1056,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -882,18 +1090,18 @@ - + - + @@ -915,7 +1123,6 @@ - @@ -923,11 +1130,22 @@ - + + + + + + + + + + + + @@ -965,6 +1183,8 @@ + + @@ -997,7 +1217,42 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1013,9 +1268,20 @@ - - + + + + + + + + + + + + + @@ -1023,6 +1289,7 @@ + @@ -1141,16 +1408,18 @@ - - + - + + + + @@ -1171,7 +1440,6 @@ - @@ -1185,6 +1453,7 @@ + @@ -1201,6 +1470,7 @@ + @@ -1213,6 +1483,17 @@ + + + + + + + + + + + @@ -1226,11 +1507,10 @@ - + - @@ -1254,14 +1534,10 @@ - - + - - - - + @@ -1273,12 +1549,8 @@ - - - - - + @@ -1291,13 +1563,14 @@ + - + @@ -1306,7 +1579,7 @@ - + @@ -1332,6 +1605,7 @@ + @@ -1383,26 +1657,26 @@ - - - + - + - - + + + + - + @@ -1436,8 +1710,7 @@ - - + @@ -1523,6 +1796,7 @@ + @@ -1595,8 +1869,8 @@ - - + + @@ -1606,7 +1880,6 @@ - @@ -1649,6 +1922,23 @@ + + + + + + + + + + + + + + + + + @@ -1695,10 +1985,10 @@ - + @@ -1710,6 +2000,8 @@ + + @@ -1767,6 +2059,19 @@ + + + + + + + + + + + + + @@ -1827,10 +2132,9 @@ - - - - + + + @@ -1852,7 +2156,7 @@ - + @@ -1868,8 +2172,9 @@ - - + + + @@ -1915,6 +2220,8 @@ + + @@ -1925,6 +2232,7 @@ + @@ -1959,19 +2267,17 @@ - - + + - - - - - - + + + + @@ -1988,6 +2294,8 @@ + + @@ -2118,13 +2426,20 @@ + + + - - + + + + - - + + + + @@ -2147,7 +2462,12 @@ + + + + + @@ -2172,8 +2492,7 @@ - - + @@ -2200,6 +2519,7 @@ + @@ -2207,6 +2527,7 @@ + @@ -2217,6 +2538,7 @@ + @@ -2236,6 +2558,17 @@ + + + + + + + + + + + @@ -2381,13 +2714,10 @@ - - - @@ -2411,8 +2741,6 @@ - - @@ -2445,6 +2773,18 @@ + + + + + + + + + + + + @@ -2457,47 +2797,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2663,7 +2962,7 @@ - + diff --git a/org.adempiere.ui.zk/WEB-INF/zk.xml b/org.adempiere.ui.zk/WEB-INF/zk.xml index 5a234469c6..440a4e7767 100644 --- a/org.adempiere.ui.zk/WEB-INF/zk.xml +++ b/org.adempiere.ui.zk/WEB-INF/zk.xml @@ -51,7 +51,7 @@ --> ajax - org.zkoss.zkmax.ui.comet.CometServerPush + org.zkoss.zk.ui.impl.PollingServerPush @@ -60,6 +60,15 @@ + + false + + + + org.zkoss.zul.Button.mold + trendy + + org.zkoss.zul.theme.fontSizeM diff --git a/org.adempiere.ui.zk/theme/default/vendor-logo.zul b/org.adempiere.ui.zk/theme/default/vendor-logo.zul index 467f22aefc..bb6688bb03 100644 --- a/org.adempiere.ui.zk/theme/default/vendor-logo.zul +++ b/org.adempiere.ui.zk/theme/default/vendor-logo.zul @@ -7,7 +7,7 @@ Copyright (C) 2009 Idalica Corporation
- +