diff --git a/base/src/org/compiere/util/CLogErrorBuffer.java b/base/src/org/compiere/util/CLogErrorBuffer.java index 5379476d02..39171c21dc 100644 --- a/base/src/org/compiere/util/CLogErrorBuffer.java +++ b/base/src/org/compiere/util/CLogErrorBuffer.java @@ -285,11 +285,11 @@ public class CLogErrorBuffer extends Handler * @param errorsOnly if true errors otherwise log * @return data array */ - public Vector getLogData (boolean errorsOnly) + public Vector> getLogData (boolean errorsOnly) { LogRecord[] records = getRecords(errorsOnly); // System.out.println("getLogData - " + events.length); - Vector rows = new Vector(records.length); + Vector> rows = new Vector>(records.length); for (int i = 0; i < records.length; i++) { diff --git a/posterita/posterita/src/main/org/posterita/keyname/AttributeValueKeyNamePair.java b/posterita/posterita/src/main/org/posterita/keyname/AttributeValueKeyNamePair.java index 1bca8f4bec..5e9a2ed497 100644 --- a/posterita/posterita/src/main/org/posterita/keyname/AttributeValueKeyNamePair.java +++ b/posterita/posterita/src/main/org/posterita/keyname/AttributeValueKeyNamePair.java @@ -36,7 +36,7 @@ import org.posterita.exceptions.SystemException; public class AttributeValueKeyNamePair extends KeyNamePairUtil { - public static ArrayList getKeyPairs(Properties ctx, String attributeName) throws OperationException, SystemException + public static ArrayList getKeyPairs(Properties ctx, String attributeName) throws OperationException, SystemException { ArrayList keyNamePairs = new ArrayList(); diff --git a/posterita/posterita/src/main/org/posterita/keyname/BankKeyNamePair.java b/posterita/posterita/src/main/org/posterita/keyname/BankKeyNamePair.java index cf49e09e4a..ad1ec99afe 100644 --- a/posterita/posterita/src/main/org/posterita/keyname/BankKeyNamePair.java +++ b/posterita/posterita/src/main/org/posterita/keyname/BankKeyNamePair.java @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.Properties; import org.compiere.util.Env; +import org.compiere.util.KeyNamePair; import org.posterita.core.KeyNamePairUtil; import org.posterita.exceptions.OperationException; @@ -32,7 +33,7 @@ import org.compiere.model.MBank; public class BankKeyNamePair extends KeyNamePairUtil { - public static ArrayList getKeyNamePairs(Properties ctx) throws OperationException + public static ArrayList getKeyNamePairs(Properties ctx) throws OperationException { String sql = "ad_client_id=" + Env.getAD_Client_ID(ctx) + " and ad_org_id=" + Env.getAD_Org_ID(ctx) + " and isactive = 'Y'"; diff --git a/posterita/posterita/src/main/org/posterita/struts/core/BaseDispatchAction.java b/posterita/posterita/src/main/org/posterita/struts/core/BaseDispatchAction.java index d8b6e40f82..858dca9b12 100644 --- a/posterita/posterita/src/main/org/posterita/struts/core/BaseDispatchAction.java +++ b/posterita/posterita/src/main/org/posterita/struts/core/BaseDispatchAction.java @@ -59,7 +59,7 @@ public class BaseDispatchAction extends DispatchAction MenuItem menuItem = (MenuItem) request.getSession().getAttribute(Constants.MENUS); Integer menuId = Integer.valueOf(df.getMenuId()); - ArrayList list = menuItem.getBreadCrumb(menuId.intValue()); + ArrayList list = menuItem.getBreadCrumb(menuId.intValue()); request.getSession().setAttribute(Constants.BREADCRUMB, list); } diff --git a/tools/src/org/apache/ecs/ConcreteElement.java b/tools/src/org/apache/ecs/ConcreteElement.java index 49a852b624..96b82779d5 100644 --- a/tools/src/org/apache/ecs/ConcreteElement.java +++ b/tools/src/org/apache/ecs/ConcreteElement.java @@ -230,7 +230,7 @@ public class ConcreteElement extends ElementAttributes implements Cloneable /** Get the keys of this element. */ - public Enumeration keys() + public Enumeration keys() { return(registryList.elements()); } @@ -238,7 +238,7 @@ public class ConcreteElement extends ElementAttributes implements Cloneable /** Get an enumeration of the elements that this element contains. */ - public Enumeration elements() + public Enumeration elements() { return(registry.elements()); } @@ -253,7 +253,7 @@ public class ConcreteElement extends ElementAttributes implements Cloneable } /** - Override output(OutputStream) incase any elements are in the registry. + Override output(OutputStream) in case any elements are in the registry. @param out OutputStream to write to. */ public void output(OutputStream out) @@ -279,7 +279,7 @@ public class ConcreteElement extends ElementAttributes implements Cloneable if(getTagText() != null) out.write(getTagText().getBytes()); - Enumeration en = registryList.elements(); + Enumeration en = registryList.elements(); while(en.hasMoreElements()) { @@ -365,7 +365,7 @@ public class ConcreteElement extends ElementAttributes implements Cloneable if(getTagText() != null) out.write(getTagText()); - Enumeration en = registryList.elements(); + Enumeration en = registryList.elements(); while(en.hasMoreElements()) { Object obj = registry.get(en.nextElement()); diff --git a/tools/src/org/apache/ecs/ElementContainer.java b/tools/src/org/apache/ecs/ElementContainer.java index a63164258e..de8e860fb4 100644 --- a/tools/src/org/apache/ecs/ElementContainer.java +++ b/tools/src/org/apache/ecs/ElementContainer.java @@ -93,7 +93,7 @@ public class ElementContainer extends ConcreteElement implements Printable Enumeration data = ec.elements(); while ( data.hasMoreElements() ) { - element = (Element) data.nextElement(); + element = data.nextElement(); element.output(out); } } @@ -107,7 +107,7 @@ public class ElementContainer extends ConcreteElement implements Printable Enumeration data = ec.elements(); while ( data.hasMoreElements() ) { - element = (Element) data.nextElement(); + element = data.nextElement(); element.output(out); } } diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/ValuePreference.java b/zkwebui/WEB-INF/src/org/adempiere/webui/ValuePreference.java index 01e848bdac..418ae00db2 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/ValuePreference.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/ValuePreference.java @@ -168,7 +168,7 @@ public class ValuePreference extends Window implements EventListener * @param Attribute attribute * @param DisplayAttribute attribute display * @param Value value - * @param DisplayValue calue display + * @param DisplayValue value display * @param displayType display type * @param AD_Reference_ID reference */ diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/WRequest.java b/zkwebui/WEB-INF/src/org/adempiere/webui/WRequest.java index 350da931ac..eac7731408 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/WRequest.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/WRequest.java @@ -18,9 +18,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.logging.Level; -import org.adempiere.webui.apps.AEnv; -import org.adempiere.webui.desktop.AbstractDesktop; -import org.adempiere.webui.panel.ADWindowPanel; import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.window.ADWindow; import org.compiere.model.GridTab; diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/acct/WAcctViewerData.java b/zkwebui/WEB-INF/src/org/adempiere/webui/acct/WAcctViewerData.java index ff20ee6790..9c6fe16021 100755 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/acct/WAcctViewerData.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/acct/WAcctViewerData.java @@ -366,11 +366,11 @@ public class WAcctViewerData { // get values (Queries) - Iterator it = whereInfo.values().iterator(); + Iterator it = whereInfo.values().iterator(); while (it.hasNext()) { - String where = (String)it.next(); + String where = it.next(); if (where != null && where.length() > 0) // add only if not empty { @@ -477,7 +477,7 @@ public class WAcctViewerData // Add Key (Lookups) - ArrayList keys = createKeyColumns(); + ArrayList keys = createKeyColumns(); int max = m_leadingColumns; if (max == 0) @@ -485,7 +485,7 @@ public class WAcctViewerData for (int i = 0; i < max; i++) { - String column = (String)keys.get(i); + String column = keys.get(i); if (column != null && column.startsWith("Date")) rm.addColumn(new RColumn(ctx, column, DisplayType.Date)); @@ -514,7 +514,7 @@ public class WAcctViewerData for (int i = max; i < keys.size(); i++) { - String column = (String)keys.get(i); + String column = keys.get(i); if (column != null && column.startsWith("Date")) rm.addColumn(new RColumn(ctx, column, DisplayType.Date)); @@ -563,7 +563,7 @@ public class WAcctViewerData * @return List of Key Columns */ - private ArrayList createKeyColumns() + private ArrayList createKeyColumns() { ArrayList columns = new ArrayList(); m_leadingColumns = 0; diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WPayment.java b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WPayment.java index 0bd031a0b9..3213ecd5fc 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WPayment.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WPayment.java @@ -657,7 +657,7 @@ public class WPayment extends Window if (m_PaymentRule == null) m_PaymentRule = ""; ValueNamePair vp = null; - HashMap values = button.getValues(); + HashMap values = button.getValues(); Object[] a = values.keySet().toArray(); for (int i = 0; i < a.length; i++) { diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java b/zkwebui/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java index b3318976e2..9fac6c88b3 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java @@ -183,7 +183,7 @@ public class AboutWindow extends Window implements EventListener { } private void updateLogTable() { - Vector data = CLogErrorBuffer.get(true).getLogData(bErrorsOnly.isChecked()); + Vector> data = CLogErrorBuffer.get(true).getLogData(bErrorsOnly.isChecked()); SimpleListModel model = new SimpleListModel(data); model.setMaxLength(new int[]{0, 0, 0, 200, 0, 200}); logTable.setItemRenderer(model);