From 6f46c586bd9e28365ddaeb76688553f9eeec7fc0 Mon Sep 17 00:00:00 2001 From: trifonnt Date: Fri, 9 Oct 2009 14:32:01 +0000 Subject: [PATCH] Code cleanup and Typo fixes. Co-effort by Felix and Trifon. --- JasperReports/Tasks.txt | 16 ---------------- JasperReports/scripts/.cvsignore | 1 - JasperReports/scripts/Version.class | Bin 546 -> 0 bytes .../src/org/compiere/report/ReportStarter.java | 2 +- base/src/org/adempiere/pipo/PackOut.java | 14 +++++--------- base/src/org/compiere/model/MSetup.java | 2 +- .../src/org/compiere/process/ClientProcess.java | 2 +- base/src/org/compiere/process/ProcessInfo.java | 2 +- .../businesslogic/HistoryFilterBean.java | 10 +++++----- .../main/org/posterita/core/SessionStorage.java | 4 ++-- utils/unix/adempiere_as_service_in_linux.txt | 2 +- utils_dev/trl/trl_Print.xsl | 2 +- 12 files changed, 18 insertions(+), 39 deletions(-) delete mode 100644 JasperReports/Tasks.txt delete mode 100644 JasperReports/scripts/.cvsignore delete mode 100644 JasperReports/scripts/Version.class diff --git a/JasperReports/Tasks.txt b/JasperReports/Tasks.txt deleted file mode 100644 index 35144a2790..0000000000 --- a/JasperReports/Tasks.txt +++ /dev/null @@ -1,16 +0,0 @@ -Variables not resolved: -J2EE -SYBASE_JDBC3 - -Variables resolved: -BARBECUE -COMMONS_BEANUTILS -COMMONS_COLLECTIONS -COMMONS_DIGESTER -COMMONS_LOGGING -IREPORT -JASPERREPORTS -ORACLE -POSTGRESQL -SYBASE -XERCES diff --git a/JasperReports/scripts/.cvsignore b/JasperReports/scripts/.cvsignore deleted file mode 100644 index 5241a7220a..0000000000 --- a/JasperReports/scripts/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.class \ No newline at end of file diff --git a/JasperReports/scripts/Version.class b/JasperReports/scripts/Version.class deleted file mode 100644 index fad748bb58ffbb3fceb50029aa7ae0df75f3829e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 546 zcmZuuO-sW-5PjRGNg88qQ(Hf)^$V*)0s&7IFMwAl-y7oMEja0)9XCT^>IT-`e32)lwrD?kitf^pEM+18b_H{IIpx{u)5sn!ecTN)V zxXYt3P7^B`#3Ca5Ps>oA*YMzu_#j;f&B|gZB#|fR>9n<^<|TbBlDs7;_eqyl zg9xohYB{AJxZ}4Os?$Oi!wgE4fjrWyw(RRZHLK8MvX!Gv`ha1DyariDws8Il_D&9I xNvAvw$^=|RiTn&|BR@?xjGU35K& diff --git a/JasperReports/src/org/compiere/report/ReportStarter.java b/JasperReports/src/org/compiere/report/ReportStarter.java index aea31d4e1d..091d48ec8e 100644 --- a/JasperReports/src/org/compiere/report/ReportStarter.java +++ b/JasperReports/src/org/compiere/report/ReportStarter.java @@ -379,7 +379,7 @@ public class ReportStarter implements ProcessCall, ClientProcess return false; } - String reportPath = reportData.getReportFilePath(); + String reportPath = reportData.getReportFilePath(); if (Util.isEmpty(reportPath, true)) { reportResult(AD_PInstance_ID, "Can not find report", trxName); diff --git a/base/src/org/adempiere/pipo/PackOut.java b/base/src/org/adempiere/pipo/PackOut.java index 631d6da8dd..61b12e8274 100644 --- a/base/src/org/adempiere/pipo/PackOut.java +++ b/base/src/org/adempiere/pipo/PackOut.java @@ -450,15 +450,11 @@ public class PackOut extends SvrProcess } //create compressed packages - //set the files - File srcFolder = new File(""); - File destZipFile = new File(""); - File destTarFile = new File(""); - File destGZipFile = new File(""); - srcFolder = (new File(packagedir)); - destZipFile = (new File(packagename+".zip")); - destTarFile = (new File(packagename+".tar")); - destGZipFile = (new File(packagename+".tar.gz")); + //set the files + File srcFolder = new File(packagedir); + File destZipFile = new File(packagename+".zip"); + File destTarFile = new File(packagename+".tar"); + File destGZipFile = new File(packagename+".tar.gz"); //delete the old packages if necessary boolean success = destZipFile.delete(); diff --git a/base/src/org/compiere/model/MSetup.java b/base/src/org/compiere/model/MSetup.java index bc59591b1d..c63a13eb60 100644 --- a/base/src/org/compiere/model/MSetup.java +++ b/base/src/org/compiere/model/MSetup.java @@ -109,7 +109,7 @@ public final class MSetup // info header m_info = new StringBuffer(); - // Standarc columns + // Standard columns String name = null; String sql = null; int no = 0; diff --git a/base/src/org/compiere/process/ClientProcess.java b/base/src/org/compiere/process/ClientProcess.java index c085201fe0..77ea455909 100644 --- a/base/src/org/compiere/process/ClientProcess.java +++ b/base/src/org/compiere/process/ClientProcess.java @@ -14,7 +14,7 @@ package org.compiere.process; /** - * Marker interface to markt that a process can only be run on the client + * Marker interface to mark that a process can only be run on the client * side. * @author Low Heng Sin */ diff --git a/base/src/org/compiere/process/ProcessInfo.java b/base/src/org/compiere/process/ProcessInfo.java index 2eb9cd9a87..d52dac9ecd 100644 --- a/base/src/org/compiere/process/ProcessInfo.java +++ b/base/src/org/compiere/process/ProcessInfo.java @@ -89,7 +89,7 @@ public class ProcessInfo implements Serializable // -- Optional -- - /** Pricess Instance ID */ + /** Process Instance ID */ private int m_AD_PInstance_ID = 0; /** Summary of Execution */ diff --git a/posterita/posterita/src/main/org/posterita/businesslogic/HistoryFilterBean.java b/posterita/posterita/src/main/org/posterita/businesslogic/HistoryFilterBean.java index bf91648e25..9f6021aa80 100644 --- a/posterita/posterita/src/main/org/posterita/businesslogic/HistoryFilterBean.java +++ b/posterita/posterita/src/main/org/posterita/businesslogic/HistoryFilterBean.java @@ -33,16 +33,16 @@ public class HistoryFilterBean private TreeSet bPartnerList = new TreeSet(); private TreeSet docStatusList = new TreeSet(); - public HistoryFilterBean(ArrayList beans) + public HistoryFilterBean(ArrayList beans) { if(beans!=null) { - Iterator iter = beans.iterator(); + Iterator iter = beans.iterator(); while(iter.hasNext()) { - FilterBean bean = (FilterBean) iter.next(); + FilterBean bean = iter.next(); if(bean.getPartnerId()!=null) { @@ -61,12 +61,12 @@ public class HistoryFilterBean } - public TreeSet getBPartnerList() + public TreeSet getBPartnerList() { return bPartnerList; } - public TreeSet getDocStatusList() + public TreeSet getDocStatusList() { return docStatusList; } diff --git a/posterita/posterita/src/main/org/posterita/core/SessionStorage.java b/posterita/posterita/src/main/org/posterita/core/SessionStorage.java index f1bd51aa7b..e168383764 100644 --- a/posterita/posterita/src/main/org/posterita/core/SessionStorage.java +++ b/posterita/posterita/src/main/org/posterita/core/SessionStorage.java @@ -106,8 +106,8 @@ public class SessionStorage { HistoryFilterBean orderHistoryBeans = new HistoryFilterBean(orderHistory); - TreeSet bPartners = orderHistoryBeans.getBPartnerList(); - TreeSet docStatus = orderHistoryBeans.getDocStatusList(); + TreeSet bPartners = orderHistoryBeans.getBPartnerList(); + TreeSet docStatus = orderHistoryBeans.getDocStatusList(); request.getSession().setAttribute(Constants.BPARTNER, bPartners); request.getSession().setAttribute(Constants.DOC_STATUS, docStatus); diff --git a/utils/unix/adempiere_as_service_in_linux.txt b/utils/unix/adempiere_as_service_in_linux.txt index 3d245f85ad..0eb3d95eb0 100644 --- a/utils/unix/adempiere_as_service_in_linux.txt +++ b/utils/unix/adempiere_as_service_in_linux.txt @@ -10,7 +10,7 @@ The script will have to be adjusted to your own environment by setting the appropriate variables. One advantage of this script is that it really waits until -the server decalres it is started up or shut down before +the server declares it is started up or shut down before echoing "[OK]" to the screen. A major disadvantage is that it runs the server as root, diff --git a/utils_dev/trl/trl_Print.xsl b/utils_dev/trl/trl_Print.xsl index 08cc2159a2..6ced424c61 100644 --- a/utils_dev/trl/trl_Print.xsl +++ b/utils_dev/trl/trl_Print.xsl @@ -3,7 +3,7 @@ - +