From 024c8d35c90307801dc9a73da17c8c55cb125e9e Mon Sep 17 00:00:00 2001 From: Richard Morales Date: Thu, 13 Dec 2012 18:11:40 -0500 Subject: [PATCH] IDEMPIERE-455 Discover and fix FindBugs problems / Pattern LSYC_LOCAL_SYNCHRONIZED --- .../src/org/adempiere/process/PrepareMigrationScripts.java | 4 ++-- org.adempiere.base/src/org/compiere/model/MRole.java | 5 ++--- .../src/org/compiere/print/ServerReportCtl.java | 4 ++-- .../adempiere/webui/adwindow/AbstractADWindowContent.java | 5 ++--- .../src/org/adempiere/webui/window/WFieldRecordInfo.java | 5 +++-- .../src/org/adempiere/webui/window/WRecordInfo.java | 7 ++++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/org.adempiere.base.process/src/org/adempiere/process/PrepareMigrationScripts.java b/org.adempiere.base.process/src/org/adempiere/process/PrepareMigrationScripts.java index bf0d65afc8..87de2cf3da 100644 --- a/org.adempiere.base.process/src/org/adempiere/process/PrepareMigrationScripts.java +++ b/org.adempiere.base.process/src/org/adempiere/process/PrepareMigrationScripts.java @@ -34,9 +34,9 @@ import java.io.FilenameFilter; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Timestamp; +import java.util.ArrayList; import java.util.Calendar; import java.util.Scanner; -import java.util.Vector; import java.util.logging.Level; import org.compiere.Adempiere; @@ -63,7 +63,7 @@ public class PrepareMigrationScripts extends SvrProcess { // The list of files can also be retrieved as File objects File[] dirList = dir.listFiles(); - Vector fileName = new Vector(); + ArrayList fileName = new ArrayList(); FilenameFilter filter = new FilenameFilter() { public boolean accept(File dir, String name) { diff --git a/org.adempiere.base/src/org/compiere/model/MRole.java b/org.adempiere.base/src/org/compiere/model/MRole.java index f6acef1d97..507a352204 100644 --- a/org.adempiere.base/src/org/compiere/model/MRole.java +++ b/org.adempiere.base/src/org/compiere/model/MRole.java @@ -33,7 +33,6 @@ import java.util.List; import java.util.Map.Entry; import java.util.Properties; import java.util.Set; -import java.util.Vector; import java.util.logging.Level; import org.adempiere.exceptions.AdempiereException; @@ -2494,7 +2493,7 @@ public final class MRole extends X_AD_Role if (maxIndex <= 0) return maxIndex; // - final Vector validOptions = new Vector(); + final ArrayList validOptions = new ArrayList(); final List params = new ArrayList(); params.add(clientId); params.add(docTypeId); @@ -2519,7 +2518,7 @@ public final class MRole extends X_AD_Role if (roles.size() > 0) { MDocType doc = new MDocType(getCtx(), docTypeId, get_TrxName()); - Vector option = new Vector(); + ArrayList option = new ArrayList(); for (int j = 0; j < options.length; j++) { if (options[j] != null) option.add(options[j]); diff --git a/org.adempiere.base/src/org/compiere/print/ServerReportCtl.java b/org.adempiere.base/src/org/compiere/print/ServerReportCtl.java index 691b90d567..287268fe40 100644 --- a/org.adempiere.base/src/org/compiere/print/ServerReportCtl.java +++ b/org.adempiere.base/src/org/compiere/print/ServerReportCtl.java @@ -1,7 +1,7 @@ package org.compiere.print; +import java.util.ArrayList; import java.util.Properties; -import java.util.Vector; import java.util.logging.Level; import org.compiere.model.MProcess; @@ -90,7 +90,7 @@ public class ServerReportCtl { ProcessInfo pi = new ProcessInfo ("", format.getJasperProcess_ID()); pi.setPrintPreview( !IsDirectPrint ); pi.setRecord_ID ( Record_ID ); - Vector jasperPrintParams = new Vector(); + ArrayList jasperPrintParams = new ArrayList(); ProcessInfoParameter pip; if (printerName!=null && printerName.trim().length()>0) { // Override printer name diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java index 7767323016..6aa7912f63 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java @@ -30,7 +30,6 @@ import java.util.Map; import java.util.Properties; import java.util.Set; import java.util.TreeMap; -import java.util.Vector; import java.util.logging.Level; import org.adempiere.util.Callback; @@ -1872,7 +1871,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements listbox.setHeight("400px"); // Display the first 5 fields data exclude Organization, Client and YesNo field data - Vector columnNames = new Vector(); + ArrayList columnNames = new ArrayList(); GridField[] fields = adTabbox.getSelectedGridTab().getFields(); if(adTabbox.getSelectedGridTab().getField("DocumentNo")!=null){ columnNames.add(adTabbox.getSelectedGridTab().getField("DocumentNo").getColumnName()); @@ -1899,7 +1898,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements } } - Vector data = new Vector(); + ArrayList data = new ArrayList(); int noOfRows = adTabbox.getSelectedGridTab().getRowCount(); for(int i=0; i } // - Vector columnNames = new Vector(); + ArrayList columnNames = new ArrayList(); columnNames.add(Msg.translate(Env.getCtx(), "NewValue")); columnNames.add(Msg.translate(Env.getCtx(), "OldValue")); columnNames.add(Msg.translate(Env.getCtx(), "UpdatedBy")); 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 dc77ac1621..38597e31b8 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 @@ -22,6 +22,7 @@ import java.sql.ResultSet; import java.sql.Timestamp; import java.text.DecimalFormat; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Vector; import java.util.logging.Level; @@ -51,11 +52,11 @@ import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; 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; +import org.zkoss.zul.North; +import org.zkoss.zul.South; /** * Record Info (Who) With Change History @@ -263,7 +264,7 @@ public class WRecordInfo extends Window implements EventListener } // - Vector columnNames = new Vector(); + ArrayList columnNames = new ArrayList(); columnNames.add(Msg.translate(Env.getCtx(), "Name")); columnNames.add(Msg.translate(Env.getCtx(), "NewValue")); columnNames.add(Msg.translate(Env.getCtx(), "OldValue"));