diff --git a/migration/i2.1z/oracle/201411091604_IDEMPIERE-2152.sql b/migration/i2.1z/oracle/201411091604_IDEMPIERE-2152.sql index e6855ddfe6..c33a69fdc7 100644 --- a/migration/i2.1z/oracle/201411091604_IDEMPIERE-2152.sql +++ b/migration/i2.1z/oracle/201411091604_IDEMPIERE-2152.sql @@ -2,7 +2,7 @@ SET SQLBLANKLINES ON SET DEFINE OFF -- Sep 11, 2014 9:56:05 AM ICT --- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +-- IDEMPIERE-2152 Info Window - Join related tabs on other columns than primary key INSERT INTO AD_Element (ColumnName,AD_Element_ID,Help,Name,Description,PrintName,AD_Element_UU,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,AD_Client_ID,EntityType,Created,Updated) VALUES ('ParentRelatedColumn_ID',202792,'default column RelatedColumn in Relate Info window will link with key column of main info window column define in ParentRelatedColumn will replace key column','Parent Related Column','column in parent info window, link with column in this relate info','Parent Related Column','d35a2b4b-6022-4b52-bace-93f05958a77a',0,100,100,'Y',0,'D',TO_DATE('2014-09-11 09:55:54','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2014-09-11 09:55:54','YYYY-MM-DD HH24:MI:SS')) ; diff --git a/migration/i2.1z/oracle/201417091982-IDEMPIERE-1969.sql b/migration/i2.1z/oracle/201417091982-IDEMPIERE-1969.sql index 7bbb87b8dc..6eef9c5c67 100644 --- a/migration/i2.1z/oracle/201417091982-IDEMPIERE-1969.sql +++ b/migration/i2.1z/oracle/201417091982-IDEMPIERE-1969.sql @@ -2,7 +2,7 @@ SET SQLBLANKLINES ON SET DEFINE OFF -- Sep 17, 2014 11:44:24 AM ICT --- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +-- IDEMPIERE-1969 Contextual Menu for Info Window Parameters INSERT INTO AD_Column (SeqNoSelection,IsSyncDatabase,Version,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Description,Help,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,AD_Client_ID,EntityType,IsEncrypted,IsSecure,FKConstraintName,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,'N',0,211766,'N','N','N',0,'N',10,'N','N','N','Y','d32e78d0-660c-4e82-9797-52a00ce3042f','N','AD_InfoWindow_ID','Info and search/select Window','The Info window is used to search and select records as well as display information relevant to the selection.','Info Window','Y',TO_DATE('2014-09-17 11:44:23','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_DATE('2014-09-17 11:44:23','YYYY-MM-DD HH24:MI:SS'),100,'N','N',0,'D','N','N','ad_infowindow_preference','N',3068,19,195) ; diff --git a/migration/i2.1z/postgresql/201411091604_IDEMPIERE-2152.sql b/migration/i2.1z/postgresql/201411091604_IDEMPIERE-2152.sql index 070bb20cbf..10493e744a 100644 --- a/migration/i2.1z/postgresql/201411091604_IDEMPIERE-2152.sql +++ b/migration/i2.1z/postgresql/201411091604_IDEMPIERE-2152.sql @@ -1,5 +1,5 @@ -- Sep 11, 2014 9:56:05 AM ICT --- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +-- IDEMPIERE-2152 Info Window - Join related tabs on other columns than primary key INSERT INTO AD_Element (ColumnName,AD_Element_ID,Help,Name,Description,PrintName,AD_Element_UU,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,AD_Client_ID,EntityType,Created,Updated) VALUES ('ParentRelatedColumn_ID',202792,'default column RelatedColumn in Relate Info window will link with key column of main info window column define in ParentRelatedColumn will replace key column','Parent Related Column','column in parent info window, link with column in this relate info','Parent Related Column','d35a2b4b-6022-4b52-bace-93f05958a77a',0,100,100,'Y',0,'D',TO_TIMESTAMP('2014-09-11 09:55:54','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2014-09-11 09:55:54','YYYY-MM-DD HH24:MI:SS')) ; diff --git a/migration/i2.1z/postgresql/201417091982-IDEMPIERE-1969.sql b/migration/i2.1z/postgresql/201417091982-IDEMPIERE-1969.sql index e0be5a46a5..ce6083c81e 100644 --- a/migration/i2.1z/postgresql/201417091982-IDEMPIERE-1969.sql +++ b/migration/i2.1z/postgresql/201417091982-IDEMPIERE-1969.sql @@ -1,5 +1,5 @@ -- Sep 17, 2014 11:44:24 AM ICT --- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +-- IDEMPIERE-1969 Contextual Menu for Info Window Parameters INSERT INTO AD_Column (SeqNoSelection,IsSyncDatabase,Version,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Description,Help,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,AD_Client_ID,EntityType,IsEncrypted,IsSecure,FKConstraintName,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,'N',0,211766,'N','N','N',0,'N',10,'N','N','N','Y','d32e78d0-660c-4e82-9797-52a00ce3042f','N','AD_InfoWindow_ID','Info and search/select Window','The Info window is used to search and select records as well as display information relevant to the selection.','Info Window','Y',TO_TIMESTAMP('2014-09-17 11:44:23','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_TIMESTAMP('2014-09-17 11:44:23','YYYY-MM-DD HH24:MI:SS'),100,'N','N',0,'D','N','N','ad_infowindow_preference','N',3068,19,195) ; diff --git a/org.adempiere.base/src/org/adempiere/model/MInfoProcess.java b/org.adempiere.base/src/org/adempiere/model/MInfoProcess.java index 5b15a5fc18..18e1d175d1 100644 --- a/org.adempiere.base/src/org/adempiere/model/MInfoProcess.java +++ b/org.adempiere.base/src/org/adempiere/model/MInfoProcess.java @@ -31,11 +31,10 @@ import org.compiere.util.Evaluator; * */ public class MInfoProcess extends X_AD_InfoProcess implements IInfoColumn { - /** * */ - private static final long serialVersionUID = 6603281032935632048L; + private static final long serialVersionUID = -5586972894900686397L; /** * {@inheritDoc} diff --git a/org.adempiere.base/src/org/adempiere/model/MInfoRelated.java b/org.adempiere.base/src/org/adempiere/model/MInfoRelated.java index ec090d532b..071b5eafc5 100644 --- a/org.adempiere.base/src/org/adempiere/model/MInfoRelated.java +++ b/org.adempiere.base/src/org/adempiere/model/MInfoRelated.java @@ -22,11 +22,10 @@ import org.compiere.model.Query; import org.compiere.model.X_AD_InfoRelated; public class MInfoRelated extends X_AD_InfoRelated implements IInfoColumn { - /** * */ - private static final long serialVersionUID = -4239930986439783006L; + private static final long serialVersionUID = -6216174103510277333L; public MInfoRelated(Properties ctx, int AD_InfoRelated_ID, String trxName) { super(ctx, AD_InfoRelated_ID, trxName); diff --git a/org.adempiere.base/src/org/compiere/model/GridField.java b/org.adempiere.base/src/org/compiere/model/GridField.java index 9d14a78914..b11958d595 100644 --- a/org.adempiere.base/src/org/compiere/model/GridField.java +++ b/org.adempiere.base/src/org/compiere/model/GridField.java @@ -81,7 +81,7 @@ public class GridField /** * */ - private static final long serialVersionUID = 8596059010377209016L; + private static final long serialVersionUID = -5875251339128387039L; /** * Field Constructor. diff --git a/org.adempiere.base/src/org/compiere/model/GridFieldVO.java b/org.adempiere.base/src/org/compiere/model/GridFieldVO.java index 8291705e98..b9e53c0a8e 100644 --- a/org.adempiere.base/src/org/compiere/model/GridFieldVO.java +++ b/org.adempiere.base/src/org/compiere/model/GridFieldVO.java @@ -47,7 +47,7 @@ public class GridFieldVO implements Serializable /** * */ - private static final long serialVersionUID = -7001013190366328211L; + private static final long serialVersionUID = 5633655630654835665L; /** * Return the SQL statement used for the MFieldVO.create diff --git a/org.adempiere.extend/src/test/functional/QueryTest.java b/org.adempiere.extend/src/test/functional/QueryTest.java index ad8b161bc1..b09e88d465 100644 --- a/org.adempiere.extend/src/test/functional/QueryTest.java +++ b/org.adempiere.extend/src/test/functional/QueryTest.java @@ -15,11 +15,8 @@ package test.functional; import java.sql.Timestamp; import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Map; import org.adempiere.exceptions.DBException; import org.compiere.model.MTable; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ValuePreference.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ValuePreference.java index 2c9e24d1b0..794f3f101e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ValuePreference.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ValuePreference.java @@ -67,7 +67,7 @@ public class ValuePreference extends Window implements EventListener /** * */ - private static final long serialVersionUID = 737741552754618206L; + private static final long serialVersionUID = 7594680475358417813L; /** * Factory diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/StatusBar.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/StatusBar.java index 8ed8587753..43187e8b8e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/StatusBar.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/StatusBar.java @@ -18,7 +18,6 @@ package org.adempiere.webui.adwindow; import org.adempiere.webui.LayoutUtils; -import org.adempiere.webui.apps.AEnv; import org.adempiere.webui.component.DocumentLink; import org.adempiere.webui.component.Label; import org.adempiere.webui.component.Panel; @@ -33,7 +32,6 @@ 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.zul.A; import org.zkoss.zul.Caption; import org.zkoss.zul.Div; import org.zkoss.zul.Hlayout; @@ -50,12 +48,12 @@ import org.zkoss.zul.Space; */ public class StatusBar extends Panel implements EventListener { - /** - * + /** + * */ - private static final long serialVersionUID = -3262889055635240201L; + private static final long serialVersionUID = 1519490416637936553L; - private Label infoLine; + private Label infoLine; private Div west; 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 334d13f327..93489ca59e 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 @@ -100,13 +100,13 @@ import com.lowagie.text.pdf.PdfWriter; */ public class ProcessDialog extends AbstractProcessDialog implements EventListener, IHelpContext { + /** + * + */ + private static final long serialVersionUID = 1320565116095846687L; + public static final String ON_INITIAL_FOCUS_EVENT = "onInitialFocus"; - /** - * generate serial version ID - */ - private static final long serialVersionUID = 3329046204196602797L; - private static final String MESSAGE_DIV_STYLE = "max-height: 150pt; overflow: auto; margin: 10px;"; /** Logger */ diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java index a9b3cd8696..0854505913 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java @@ -77,7 +77,7 @@ public class ProcessParameterPanel extends Panel implements /** * */ - private static final long serialVersionUID = 195320654866887445L; + private static final long serialVersionUID = -5730428618898681676L; private String width; 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 45780d1169..24669e4c71 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 @@ -25,7 +25,6 @@ import java.util.Calendar; import java.util.Vector; import java.util.logging.Level; -import org.adempiere.webui.apps.AEnv; import org.adempiere.webui.component.Button; import org.adempiere.webui.component.Checkbox; import org.adempiere.webui.component.DocumentLink; @@ -60,11 +59,8 @@ import org.compiere.util.Msg; import org.compiere.util.Trx; import org.compiere.util.TrxRunnable; import org.compiere.util.Util; -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.zul.A; import org.zkoss.zul.Borderlayout; import org.zkoss.zul.Center; import org.zkoss.zul.Hbox; 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 b9cb75b54f..8880000ef9 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 @@ -67,14 +67,13 @@ 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.zul.A; import org.zkoss.zul.Borderlayout; import org.zkoss.zul.Center; +import org.zkoss.zul.Div; +import org.zkoss.zul.Html; import org.zkoss.zul.Label; import org.zkoss.zul.North; import org.zkoss.zul.South; -import org.zkoss.zul.Div; -import org.zkoss.zul.Html; /** * Generate custom form window @@ -85,7 +84,7 @@ public class WGenForm extends ADForm implements EventListener, WTableMode /** * */ - private static final long serialVersionUID = -8669256486969882958L; + private static final long serialVersionUID = 4240430312911412710L; private GenForm genForm; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/DocumentLink.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/DocumentLink.java index 67925b9e34..93eaebb083 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/DocumentLink.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/DocumentLink.java @@ -35,8 +35,11 @@ import org.zkoss.zul.A; * */ public class DocumentLink extends A implements EventListener { - - private static final long serialVersionUID = -2950001959302619043L; + /** + * + */ + private static final long serialVersionUID = 1498406053715803814L; + public static final String ATT_RECORD_ID = "Record_ID"; public static final String ATT_AD_TABLE_ID = "AD_Table_ID"; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Mask.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Mask.java index f69ee9e5ce..004ae5a5a1 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Mask.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Mask.java @@ -20,11 +20,10 @@ import org.zkoss.zul.Div; * */ public class Mask extends Div { - /** - * generated serial + * */ - private static final long serialVersionUID = -9068605816183445421L; + private static final long serialVersionUID = 7462166722064971644L; /** * default constructor diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ProcessInfoDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ProcessInfoDialog.java index 54c58fd727..ecfad116da 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ProcessInfoDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ProcessInfoDialog.java @@ -32,7 +32,6 @@ 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.zul.A; import org.zkoss.zul.Hbox; import org.zkoss.zul.Image; import org.zkoss.zul.Separator; @@ -43,7 +42,11 @@ import org.zkoss.zul.Separator; * @author Deepak Pansheriya */ public class ProcessInfoDialog extends Window implements EventListener { - private static final long serialVersionUID = -4957498533838144942L; + /** + * + */ + private static final long serialVersionUID = 4479446865514015847L; + private static final String MESSAGE_PANEL_STYLE = "text-align:left; word-break: break-all; overflow: auto; max-height: 250pt; min-width: 230pt; max-width: 450pt;"; private Text lblMsg = new Text(); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Tabpanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Tabpanel.java index 779ff32e3a..a1478fa0e0 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Tabpanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Tabpanel.java @@ -31,10 +31,10 @@ import org.zkoss.zul.Tab; */ public class Tabpanel extends org.zkoss.zul.Tabpanel implements IdSpace, ISupportMask { - /** + /** * */ - private static final long serialVersionUID = -3392752891445762516L; + private static final long serialVersionUID = -1057250877531248907L; private ITabOnCloseHandler onCloseHandler = null; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Window.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Window.java index ce28cb2738..0a0a50c42e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Window.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Window.java @@ -33,10 +33,11 @@ import org.zkoss.zk.ui.event.Events; */ public class Window extends org.zkoss.zul.Window implements ISupportMask { - /** + /** * */ - private static final long serialVersionUID = -977158068979292880L; + private static final long serialVersionUID = -8249071775776387012L; + /*** Show as modal window ***/ public static final String MODE_MODAL = "modal"; /*** Show as popup window ***/ diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java index 8e7c16fb32..f8e9e8e65f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java @@ -98,7 +98,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL /** * */ - private static final long serialVersionUID = 2751982942639167289L; + private static final long serialVersionUID = -19192097402087013L; protected Grid parameterGrid; private Borderlayout layout; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/AbstractUIPart.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/AbstractUIPart.java index adb5902a26..0069d4af24 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/AbstractUIPart.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/AbstractUIPart.java @@ -12,6 +12,8 @@ *****************************************************************************/ package org.adempiere.webui.part; +import java.awt.BorderLayout; + import org.adempiere.webui.ISupportMask; import org.adempiere.webui.component.Mask; import org.adempiere.webui.desktop.IDesktop;