diff --git a/org.adempiere.base.process/src/org/compiere/process/Aging.java b/org.adempiere.base.process/src/org/compiere/process/Aging.java index 9f70688cc1..0d75a29f9e 100644 --- a/org.adempiere.base.process/src/org/compiere/process/Aging.java +++ b/org.adempiere.base.process/src/org/compiere/process/Aging.java @@ -167,7 +167,7 @@ public class Aging extends SvrProcess sql.append(" ORDER BY oi.C_BPartner_ID, oi.C_Currency_ID, oi.C_Invoice_ID"); - log.finest(sql.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(sql.toString()); String finalSql = MRole.getDefault(getCtx(), false).addAccessSQL( sql.toString(), "oi", MRole.SQL_FULLYQUALIFIED, MRole.SQL_RO); log.finer(finalSql); diff --git a/org.adempiere.base.process/src/org/compiere/process/ImportBPartner.java b/org.adempiere.base.process/src/org/compiere/process/ImportBPartner.java index 699ccdc06f..3772fe8a39 100644 --- a/org.adempiere.base.process/src/org/compiere/process/ImportBPartner.java +++ b/org.adempiere.base.process/src/org/compiere/process/ImportBPartner.java @@ -336,7 +336,7 @@ implements ImportProcess { impBP.setC_BPartner_ID(bp.getC_BPartner_ID()); msglog = new StringBuilder("Insert BPartner - ").append(bp.getC_BPartner_ID()); - log.finest(msglog.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(msglog.toString()); noInsert++; } else @@ -377,7 +377,7 @@ implements ImportProcess if (bp.save()) { msglog = new StringBuilder("Update BPartner - ").append(bp.getC_BPartner_ID()); - log.finest(msglog.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(msglog.toString()); noUpdate++; } else @@ -430,7 +430,7 @@ implements ImportProcess location.setPostal_Add(impBP.getPostal_Add()); if (location.save()){ msglog = new StringBuilder("Insert Location - ").append(location.getC_Location_ID()); - log.finest(msglog.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(msglog.toString()); } else { @@ -453,7 +453,7 @@ implements ImportProcess if (bpl.save()) { msglog = new StringBuilder("Insert BP Location - ").append(bpl.getC_BPartner_Location_ID()); - log.finest(msglog.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(msglog.toString()); impBP.setC_BPartner_Location_ID(bpl.getC_BPartner_Location_ID()); } else @@ -518,7 +518,7 @@ implements ImportProcess if (user.save()) { msglog = new StringBuilder("Update BP Contact - ").append(user.getAD_User_ID()); - log.finest(msglog.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(msglog.toString()); } else { @@ -556,7 +556,7 @@ implements ImportProcess if (user.save()) { msglog = new StringBuilder("Insert BP Contact - ").append(user.getAD_User_ID()); - log.finest(msglog.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(msglog.toString()); impBP.setAD_User_ID(user.getAD_User_ID()); } else diff --git a/org.adempiere.base.process/src/org/compiere/process/ImportReportLine.java b/org.adempiere.base.process/src/org/compiere/process/ImportReportLine.java index 4a77ccd7ed..0bed108d9b 100644 --- a/org.adempiere.base.process/src/org/compiere/process/ImportReportLine.java +++ b/org.adempiere.base.process/src/org/compiere/process/ImportReportLine.java @@ -305,12 +305,12 @@ public class ImportReportLine extends SvrProcess pstmt_insertLine.setString(3, Name); // no = pstmt_insertLine.executeUpdate(); - log.finest("Insert ReportLine = " + no + ", PA_ReportLine_ID=" + PA_ReportLine_ID); + if (log.isLoggable(Level.FINEST)) log.finest("Insert ReportLine = " + no + ", PA_ReportLine_ID=" + PA_ReportLine_ID); noInsertLine++; } catch (Exception ex) { - log.finest(ex.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(ex.toString()); continue; } } @@ -427,12 +427,12 @@ public class ImportReportLine extends SvrProcess pstmt_insertSource.setInt(2, I_ReportLine_ID); // no = pstmt_insertSource.executeUpdate(); - log.finest("Insert ReportSource = " + no + ", I_ReportLine_ID=" + I_ReportLine_ID + ", PA_ReportSource_ID=" + PA_ReportSource_ID); + if (log.isLoggable(Level.FINEST)) log.finest("Insert ReportSource = " + no + ", I_ReportLine_ID=" + I_ReportLine_ID + ", PA_ReportSource_ID=" + PA_ReportSource_ID); noInsertSource++; } catch (Exception ex) { - log.finest("Insert ReportSource - " + ex.toString()); + if (log.isLoggable(Level.FINEST)) log.finest("Insert ReportSource - " + ex.toString()); sql = new StringBuilder ("UPDATE I_ReportLine i ") .append("SET I_IsImported='E', I_ErrorMsg=I_ErrorMsg||").append(DB.TO_STRING("Insert ElementSource: " + ex.toString())) .append("WHERE I_ReportLine_ID=").append(I_ReportLine_ID); @@ -458,12 +458,12 @@ public class ImportReportLine extends SvrProcess { no = pstmt_updateSource.executeUpdate(); //no = DB.executeUpdate(sqlt, get_TrxName()); - log.finest("Update ReportSource = " + no + ", I_ReportLine_ID=" + I_ReportLine_ID + ", PA_ReportSource_ID=" + PA_ReportSource_ID); + if (log.isLoggable(Level.FINEST)) log.finest("Update ReportSource = " + no + ", I_ReportLine_ID=" + I_ReportLine_ID + ", PA_ReportSource_ID=" + PA_ReportSource_ID); noUpdateSource++; } catch (SQLException ex) { - log.finest( "Update ReportSource - " + ex.toString()); + if (log.isLoggable(Level.FINEST)) log.finest( "Update ReportSource - " + ex.toString()); sql = new StringBuilder ("UPDATE I_ReportLine i ") .append("SET I_IsImported='E', I_ErrorMsg=I_ErrorMsg||").append(DB.TO_STRING("Update ElementSource: " + ex.toString())) .append("WHERE I_ReportLine_ID=").append(I_ReportLine_ID); @@ -489,7 +489,7 @@ public class ImportReportLine extends SvrProcess // Delete report sources with null account pstmt_deleteSource.setInt(1, PA_ReportSource_ID); no = pstmt_deleteSource.executeUpdate(); - log.finest("Delete ReportSource with Null Account= " + no + ", I_ReportLine_ID=" + I_ReportLine_ID + ", PA_ReportSource_ID=" + PA_ReportSource_ID); + if (log.isLoggable(Level.FINEST)) log.finest("Delete ReportSource with Null Account= " + no + ", I_ReportLine_ID=" + I_ReportLine_ID + ", PA_ReportSource_ID=" + PA_ReportSource_ID); // End afalcone 22/02/2007 - F.R. [ 1642250 ] Import ReportLine / Very Slow Reports commitEx(); diff --git a/org.adempiere.base.process/src/org/compiere/process/ReplenishReport.java b/org.adempiere.base.process/src/org/compiere/process/ReplenishReport.java index 52e42303c4..6a784a1598 100644 --- a/org.adempiere.base.process/src/org/compiere/process/ReplenishReport.java +++ b/org.adempiere.base.process/src/org/compiere/process/ReplenishReport.java @@ -222,7 +222,7 @@ public class ReplenishReport extends SvrProcess if (p_C_BPartner_ID != 0) sql.append(" AND po.C_BPartner_ID=").append(p_C_BPartner_ID); int no = DB.executeUpdate(sql.toString(), get_TrxName()); - log.finest(sql.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(sql.toString()); log.fine("Insert (1) #" + no); if (p_C_BPartner_ID == 0) diff --git a/org.adempiere.base.process/src/org/compiere/process/ReplenishReportProduction.java b/org.adempiere.base.process/src/org/compiere/process/ReplenishReportProduction.java index ff3e801250..3271c8a6b5 100644 --- a/org.adempiere.base.process/src/org/compiere/process/ReplenishReportProduction.java +++ b/org.adempiere.base.process/src/org/compiere/process/ReplenishReportProduction.java @@ -236,7 +236,7 @@ public class ReplenishReportProduction extends SvrProcess if ( isKanban != null ) sql.append(" AND p.IsKanban = '").append(isKanban).append("' "); int no = DB.executeUpdate(sql.toString(), get_TrxName()); - log.finest(sql.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(sql.toString()); log.fine("Insert (1) #" + no); if (p_C_BPartner_ID == 0) diff --git a/org.adempiere.base/src/org/adempiere/impexp/AbstractExcelExporter.java b/org.adempiere.base/src/org/adempiere/impexp/AbstractExcelExporter.java index 3c417ea63f..68bdf41b5a 100644 --- a/org.adempiere.base/src/org/adempiere/impexp/AbstractExcelExporter.java +++ b/org.adempiere.base/src/org/adempiere/impexp/AbstractExcelExporter.java @@ -216,7 +216,7 @@ public abstract class AbstractExcelExporter format = new StringBuffer(f).append(";[RED]-").append(f); } // - if (CLogMgt.isLevelFinest()) log.finest("NumberFormat: "+format); + if (log.isLoggable(Level.FINEST)) log.finest("NumberFormat: "+format); return format.toString(); } diff --git a/org.adempiere.base/src/org/compiere/db/CreateAdempiere.java b/org.adempiere.base/src/org/compiere/db/CreateAdempiere.java index 7cfd5e7e70..29e464ebc1 100644 --- a/org.adempiere.base/src/org/compiere/db/CreateAdempiere.java +++ b/org.adempiere.base/src/org/compiere/db/CreateAdempiere.java @@ -746,7 +746,7 @@ public class CreateAdempiere writeLog(cmd); log.finer(cmd); int no = stmt.executeUpdate(cmd); - log.finest("# " + no); + if (log.isLoggable(Level.FINEST)) log.finest("# " + no); } // if (batch) diff --git a/org.adempiere.base/src/org/compiere/impexp/ImpFormat.java b/org.adempiere.base/src/org/compiere/impexp/ImpFormat.java index cb75518183..bd99f2b420 100644 --- a/org.adempiere.base/src/org/compiere/impexp/ImpFormat.java +++ b/org.adempiere.base/src/org/compiere/impexp/ImpFormat.java @@ -522,7 +522,7 @@ public final class ImpFormat String[] nodes = parseLine (line, true, false, true); // with label, no trace, ignore empty if (nodes.length == 0) { - log.finest("Nothing parsed from: " + line); + if (log.isLoggable(Level.FINEST)) log.finest("Nothing parsed from: " + line); return false; } // log.config( "ImpFormat.updateDB - listSize=" + nodes.length); diff --git a/org.adempiere.base/src/org/compiere/model/GridField.java b/org.adempiere.base/src/org/compiere/model/GridField.java index 79a64cfc9d..7720808ba1 100644 --- a/org.adempiere.base/src/org/compiere/model/GridField.java +++ b/org.adempiere.base/src/org/compiere/model/GridField.java @@ -339,7 +339,7 @@ public class GridField if (checkContext && m_vo.MandatoryLogic.length() > 0) { boolean retValue = Evaluator.evaluateLogic(this, m_vo.MandatoryLogic); - log.finest(m_vo.ColumnName + " Mandatory(" + m_vo.MandatoryLogic + ") => Mandatory-" + retValue); + if (log.isLoggable(Level.FINEST)) log.finest(m_vo.ColumnName + " Mandatory(" + m_vo.MandatoryLogic + ") => Mandatory-" + retValue); if (retValue) return true; } @@ -373,7 +373,7 @@ public class GridField if (checkContext && m_vo.ReadOnlyLogic.length() > 0) { boolean retValue = !Evaluator.evaluateLogic(this, m_vo.ReadOnlyLogic); - log.finest(m_vo.ColumnName + " R/O(" + m_vo.ReadOnlyLogic + ") => R/W-" + retValue); + if (log.isLoggable(Level.FINEST)) log.finest(m_vo.ColumnName + " R/O(" + m_vo.ReadOnlyLogic + ") => R/W-" + retValue); if (!retValue) return false; } @@ -423,21 +423,21 @@ public class GridField // Tab or field is R/O if (m_vo.tabReadOnly || m_vo.IsReadOnly) { - log.finest(m_vo.ColumnName + " NO - TabRO=" + m_vo.tabReadOnly + ", FieldRO=" + m_vo.IsReadOnly); + if (log.isLoggable(Level.FINEST)) log.finest(m_vo.ColumnName + " NO - TabRO=" + m_vo.tabReadOnly + ", FieldRO=" + m_vo.IsReadOnly); return false; } // Not Updateable - only editable if new updateable row if (!m_vo.IsUpdateable && !m_inserting) { - log.finest(m_vo.ColumnName + " NO - FieldUpdateable=" + m_vo.IsUpdateable); + if (log.isLoggable(Level.FINEST)) log.finest(m_vo.ColumnName + " NO - FieldUpdateable=" + m_vo.IsUpdateable); return false; } // Field is the Link Column of the tab if (m_vo.ColumnName.equals(Env.getContext(ctx, m_vo.WindowNo, m_vo.TabNo, GridTab.CTX_LinkColumnName))) { - log.finest(m_vo.ColumnName + " NO - LinkColumn"); + if (log.isLoggable(Level.FINEST)) log.finest(m_vo.ColumnName + " NO - LinkColumn"); return false; } @@ -464,7 +464,7 @@ public class GridField if (checkContext && m_vo.ReadOnlyLogic.length() > 0) { boolean retValue = !Evaluator.evaluateLogic(this, m_vo.ReadOnlyLogic); - log.finest(m_vo.ColumnName + " R/O(" + m_vo.ReadOnlyLogic + ") => R/W-" + retValue); + if (log.isLoggable(Level.FINEST)) log.finest(m_vo.ColumnName + " R/O(" + m_vo.ReadOnlyLogic + ") => R/W-" + retValue); if (!retValue) return false; } @@ -794,7 +794,7 @@ public class GridField // need to re-set invalid values - OK BPartner in PO Line - not OK SalesRep in Invoice if (m_lookup.getDirect(m_value, false, true) == null) { - log.finest(m_vo.ColumnName + " Serach not valid - set to null"); + if (log.isLoggable(Level.FINEST)) log.finest(m_vo.ColumnName + " Serach not valid - set to null"); setValue(null, m_inserting); m_error = true; return false; @@ -811,7 +811,7 @@ public class GridField if (isKey() || isParentValue()) // parents/ket are not validated return true; - log.finest(m_vo.ColumnName + " - set to null"); + if (log.isLoggable(Level.FINEST)) log.finest(m_vo.ColumnName + " - set to null"); setValue(null, m_inserting); m_error = true; return false; @@ -852,7 +852,7 @@ public class GridField } }; boolean retValue = Evaluator.evaluateLogic(evaluatee, m_vo.DisplayLogic); - log.finest(m_vo.ColumnName + if (log.isLoggable(Level.FINEST)) log.finest(m_vo.ColumnName + " (" + m_vo.DisplayLogic + ") => " + retValue); return retValue; } @@ -1804,8 +1804,7 @@ public class GridField private final void backupValue() { if (!m_isBackupValue) { m_backupValue = get_ValueAsString(m_vo.ColumnName); - if (CLogMgt.isLevelFinest()) - log.finest("Backup " + m_vo.WindowNo + "|" + m_vo.ColumnName + "=" + m_backupValue); + if (log.isLoggable(Level.FINEST)) log.finest("Backup " + m_vo.WindowNo + "|" + m_vo.ColumnName + "=" + m_backupValue); m_isBackupValue = true; } } @@ -1818,14 +1817,12 @@ public class GridField if (m_isBackupValue) { if (isParentTabField()) { - if (CLogMgt.isLevelFinest()) - log.finest("Restore " + m_vo.WindowNo + "|" + m_vo.TabNo + "|" + m_vo.ColumnName + "=" + m_backupValue); + if (log.isLoggable(Level.FINEST)) log.finest("Restore " + m_vo.WindowNo + "|" + m_vo.TabNo + "|" + m_vo.ColumnName + "=" + m_backupValue); Env.setContext(m_vo.ctx, m_vo.WindowNo, m_vo.TabNo, m_vo.ColumnName, m_backupValue); } else { - if (CLogMgt.isLevelFinest()) - log.finest("Restore " + m_vo.WindowNo + "|" + m_vo.ColumnName + "=" + m_backupValue); + if (log.isLoggable(Level.FINEST)) log.finest("Restore " + m_vo.WindowNo + "|" + m_vo.ColumnName + "=" + m_backupValue); Env.setContext(m_vo.ctx, m_vo.WindowNo, m_vo.ColumnName, m_backupValue); } } diff --git a/org.adempiere.base/src/org/compiere/model/GridTab.java b/org.adempiere.base/src/org/compiere/model/GridTab.java index 98f7795f11..5edf8a616f 100644 --- a/org.adempiere.base/src/org/compiere/model/GridTab.java +++ b/org.adempiere.base/src/org/compiere/model/GridTab.java @@ -1142,7 +1142,7 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable log.warning ("Not allowed in TabNo=" + m_vo.TabNo + " -> Processed=" + processed); return false; } - log.finest("Processed=" + processed); + if (log.isLoggable(Level.FINEST)) log.finest("Processed=" + processed); } //hengsin, don't create new when parent is empty @@ -1516,7 +1516,7 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable // ** dynamic content ** uses get_ValueAsString boolean retValue = Evaluator.evaluateLogic(this, m_vo.ReadOnlyLogic); - log.finest(m_vo.Name + if (log.isLoggable(Level.FINEST)) log.finest(m_vo.Name + " (" + m_vo.ReadOnlyLogic + ") => " + retValue); return retValue; } // isReadOnly diff --git a/org.adempiere.base/src/org/compiere/model/GridTable.java b/org.adempiere.base/src/org/compiere/model/GridTable.java index a1cf349a82..28bbdfd135 100644 --- a/org.adempiere.base/src/org/compiere/model/GridTable.java +++ b/org.adempiere.base/src/org/compiere/model/GridTable.java @@ -1210,7 +1210,7 @@ public class GridTable extends AbstractTableModel || m_rowCount == 0 // no rows || row >= m_rowCount ) //invalid row { - log.finest("r=" + row + " c=" + col + " - R/O=" + m_readOnly + ", Rows=" + m_rowCount + " - Ignored"); + if (log.isLoggable(Level.FINEST)) log.finest("r=" + row + " c=" + col + " - R/O=" + m_readOnly + ", Rows=" + m_rowCount + " - Ignored"); return; } @@ -1220,7 +1220,7 @@ public class GridTable extends AbstractTableModel Object oldValue = getValueAt(row, col); if (!force && !isValueChanged(oldValue, value) ) { - log.finest("r=" + row + " c=" + col + " - New=" + value + "==Old=" + oldValue + " - Ignored"); + if (log.isLoggable(Level.FINEST)) log.finest("r=" + row + " c=" + col + " - New=" + value + "==Old=" + oldValue + " - Ignored"); return; } @@ -2312,7 +2312,7 @@ public class GridTable extends AbstractTableModel { m_createSqlColumn.add(columnName); m_createSqlValue.add(value); - log.finest("#" + m_createSqlColumn.size() + if (log.isLoggable(Level.FINEST)) log.finest("#" + m_createSqlColumn.size() + " - " + columnName + "=" + value); } // createUpdateSQL diff --git a/org.adempiere.base/src/org/compiere/model/Lookup.java b/org.adempiere.base/src/org/compiere/model/Lookup.java index b74d8a15f0..7e198350a7 100644 --- a/org.adempiere.base/src/org/compiere/model/Lookup.java +++ b/org.adempiere.base/src/org/compiere/model/Lookup.java @@ -18,6 +18,7 @@ package org.compiere.model; import java.io.Serializable; import java.util.ArrayList; +import java.util.logging.Level; import javax.swing.AbstractListModel; import javax.swing.MutableComboBoxModel; @@ -286,7 +287,7 @@ public abstract class Lookup extends AbstractListModel // Selected Object changed if (obj != m_selectedObject) { - log.finest(getColumnName() + ": SelectedValue Changed=" + obj + "->" + m_selectedObject); + if (log.isLoggable(Level.FINEST)) log.finest(getColumnName() + ": SelectedValue Changed=" + obj + "->" + m_selectedObject); obj = m_selectedObject; } diff --git a/org.adempiere.base/src/org/compiere/model/MAsset.java b/org.adempiere.base/src/org/compiere/model/MAsset.java index 6665f745ee..d27a600d8d 100644 --- a/org.adempiere.base/src/org/compiere/model/MAsset.java +++ b/org.adempiere.base/src/org/compiere/model/MAsset.java @@ -6,10 +6,10 @@ import java.sql.Timestamp; import java.util.ArrayList; import java.util.Collection; import java.util.Properties; +import java.util.logging.Level; import javax.servlet.http.HttpServletRequest; -import org.compiere.util.CLogMgt; import org.compiere.util.DB; import org.compiere.util.EMail; import org.compiere.util.Env; @@ -504,7 +504,7 @@ public class MAsset extends X_A_Asset public void changeStatus(String newStatus, Timestamp date) { String status = getA_Asset_Status(); - if (CLogMgt.isLevelFinest()) log.finest("Entering: " + status + "->" + newStatus + ", date=" + date); + if (log.isLoggable(Level.FINEST)) log.finest("Entering: " + status + "->" + newStatus + ", date=" + date); // // If date is null, use context #Date diff --git a/org.adempiere.base/src/org/compiere/model/MAssetAddition.java b/org.adempiere.base/src/org/compiere/model/MAssetAddition.java index 1a4aa4bff8..06ecbcba7a 100644 --- a/org.adempiere.base/src/org/compiere/model/MAssetAddition.java +++ b/org.adempiere.base/src/org/compiere/model/MAssetAddition.java @@ -249,7 +249,7 @@ public class MAssetAddition extends X_A_Asset_Addition private MAssetAddition (MProject project) { this(project.getCtx(), 0, project.get_TrxName()); - log.finest("Entering: Project=" + project); + if (log.isLoggable(Level.FINEST)) log.finest("Entering: Project=" + project); setAD_Org_ID(project.getAD_Org_ID()); setPostingType(POSTINGTYPE_Actual); setA_SourceType(A_SOURCETYPE_Project); @@ -292,7 +292,7 @@ public class MAssetAddition extends X_A_Asset_Addition private MAssetAddition (MIFixedAsset ifa) { this(ifa.getCtx(), 0, ifa.get_TrxName()); - log.finest("Entering: ifa=" + ifa); + if (log.isLoggable(Level.FINEST)) log.finest("Entering: ifa=" + ifa); setAD_Org_ID(ifa.getAD_Org_ID()); setPostingType(POSTINGTYPE_Actual); setA_SourceType(A_SOURCETYPE_Imported); diff --git a/org.adempiere.base/src/org/compiere/model/MAssetDisposed.java b/org.adempiere.base/src/org/compiere/model/MAssetDisposed.java index aad9c688a4..06d83d8479 100644 --- a/org.adempiere.base/src/org/compiere/model/MAssetDisposed.java +++ b/org.adempiere.base/src/org/compiere/model/MAssetDisposed.java @@ -6,6 +6,7 @@ import java.math.RoundingMode; import java.sql.ResultSet; import java.util.List; import java.util.Properties; +import java.util.logging.Level; import org.compiere.process.DocAction; import org.compiere.process.DocumentEngine; @@ -50,7 +51,7 @@ implements DocAction private MAssetDisposed (MInvoiceLine invLine) { this(invLine.getCtx(),0,invLine.get_TrxName()); - log.finest("Entering: Project=" + invLine); + if (log.isLoggable(Level.FINEST)) log.finest("Entering: Project=" + invLine); setAD_Org_ID(invLine.getAD_Org_ID()); setPostingType(POSTINGTYPE_Actual); setDateDoc(invLine.getC_Invoice().getDateInvoiced()); diff --git a/org.adempiere.base/src/org/compiere/model/MCostDetail.java b/org.adempiere.base/src/org/compiere/model/MCostDetail.java index 1dd4f26889..3260256f75 100644 --- a/org.adempiere.base/src/org/compiere/model/MCostDetail.java +++ b/org.adempiere.base/src/org/compiere/model/MCostDetail.java @@ -905,7 +905,7 @@ public class MCostDetail extends X_M_CostDetail cost.setCurrentCostPrice(MCost.getSeedCosts(product, M_ASI_ID, as, Org_ID, ce.getCostingMethod(), getC_OrderLine_ID())); } - log.finest("PO - Standard - CurrentCostPrice(seed)="+cost.getCurrentCostPrice()+", price="+price); + if (log.isLoggable(Level.FINEST)) log.finest("PO - Standard - CurrentCostPrice(seed)="+cost.getCurrentCostPrice()+", price="+price); } cost.add(amt, qty); log.finer("PO - Standard - " + cost); @@ -976,7 +976,7 @@ public class MCostDetail extends X_M_CostDetail { cost.setCurrentCostPrice(MCost.getSeedCosts(product, M_ASI_ID, as, Org_ID, ce.getCostingMethod(), getC_OrderLine_ID())); - log.finest("Inv - Standard - CurrentCostPrice(seed)="+cost.getCurrentCostPrice()+", price="+price); + if (log.isLoggable(Level.FINEST)) log.finest("Inv - Standard - CurrentCostPrice(seed)="+cost.getCurrentCostPrice()+", price="+price); } cost.add(amt, qty); } @@ -1124,7 +1124,7 @@ public class MCostDetail extends X_M_CostDetail && cost.is_new()) { cost.setCurrentCostPrice(price); - log.finest("QtyAdjust - Standard - CurrentCostPrice="+price); + if (log.isLoggable(Level.FINEST)) log.finest("QtyAdjust - Standard - CurrentCostPrice="+price); } } else diff --git a/org.adempiere.base/src/org/compiere/model/MDepreciation.java b/org.adempiere.base/src/org/compiere/model/MDepreciation.java index e1dddff16e..783c78d4fe 100644 --- a/org.adempiere.base/src/org/compiere/model/MDepreciation.java +++ b/org.adempiere.base/src/org/compiere/model/MDepreciation.java @@ -220,7 +220,7 @@ public class MDepreciation extends X_A_Depreciation int lifePeriods = assetwk.getUseLifeMonths(assetwk.isFiscal()); boolean ok = (offset <= A_Current_Period); - if(CLogMgt.isLevelFinest()) log.finest("A_Current_Period=" + A_Current_Period + ", lifePeriods=" + lifePeriods + " (offset=" + offset + ") ==> OK=" + ok); + if (log.isLoggable(Level.FINEST)) log.finest("A_Current_Period=" + A_Current_Period + ", lifePeriods=" + lifePeriods + " (offset=" + offset + ") ==> OK=" + ok); return ok; } // canInvoke @@ -258,10 +258,7 @@ public class MDepreciation extends X_A_Depreciation amtPerPeriod = remainingAmt.divide(remainingPeriods, getPrecision(), RoundingMode.HALF_UP); } - if(CLogMgt.isLevelFinest()) - { - log.finest("currentPeriod=" + A_Current_Period + ", remainingAmt=" + remainingAmt + ", remainingPeriods=" + remainingPeriods + " => amtPerPeriod=" + amtPerPeriod); - } + if (log.isLoggable(Level.FINEST)) log.finest("currentPeriod=" + A_Current_Period + ", remainingAmt=" + remainingAmt + ", remainingPeriods=" + remainingPeriods + " => amtPerPeriod=" + amtPerPeriod); return amtPerPeriod; } diff --git a/org.adempiere.base/src/org/compiere/model/MInfoColumn.java b/org.adempiere.base/src/org/compiere/model/MInfoColumn.java index d02c18d800..e277a3862b 100644 --- a/org.adempiere.base/src/org/compiere/model/MInfoColumn.java +++ b/org.adempiere.base/src/org/compiere/model/MInfoColumn.java @@ -114,10 +114,8 @@ public class MInfoColumn extends X_AD_InfoColumn }; boolean retValue = Evaluator.evaluateLogic(evaluatee, getDisplayLogic()); - if (log.isLoggable(Level.FINEST)) { - log.finest(getName() + if (log.isLoggable(Level.FINEST)) log.finest(getName() + " (" + getDisplayLogic() + ") => " + retValue); - } return retValue; } diff --git a/org.adempiere.base/src/org/compiere/model/MJournal.java b/org.adempiere.base/src/org/compiere/model/MJournal.java index 36915ebc0a..d716cdfbd6 100644 --- a/org.adempiere.base/src/org/compiere/model/MJournal.java +++ b/org.adempiere.base/src/org/compiere/model/MJournal.java @@ -335,7 +335,7 @@ public class MJournal extends X_GL_Journal implements DocAction "UPDATE GL_JournalLine SET "+MJournalLine.COLUMNNAME_DateAcct+"=? WHERE GL_Journal_ID=?", new Object[]{getDateAcct(), getGL_Journal_ID()}, false, get_TrxName()); - log.finest("Updated GL_JournalLine.DateAcct #" + no); + if (log.isLoggable(Level.FINEST)) log.finest("Updated GL_JournalLine.DateAcct #" + no); } return true; } // beforeSave diff --git a/org.adempiere.base/src/org/compiere/model/MLocation.java b/org.adempiere.base/src/org/compiere/model/MLocation.java index 36be3669ea..57d2f7f38a 100644 --- a/org.adempiere.base/src/org/compiere/model/MLocation.java +++ b/org.adempiere.base/src/org/compiere/model/MLocation.java @@ -521,7 +521,7 @@ public class MLocation extends X_C_Location implements Comparator outStr.append(" ").append(super.getRegionName()); String retValue = Util.replace(outStr.toString(), "\\n", "\n"); - log.finest("parseCRP - " + c.getDisplaySequence() + " -> " + retValue); + if (log.isLoggable(Level.FINEST)) log.finest("parseCRP - " + c.getDisplaySequence() + " -> " + retValue); return retValue; } // parseContext diff --git a/org.adempiere.base/src/org/compiere/model/MLookup.java b/org.adempiere.base/src/org/compiere/model/MLookup.java index be8d7ff1be..fc1c9ac851 100644 --- a/org.adempiere.base/src/org/compiere/model/MLookup.java +++ b/org.adempiere.base/src/org/compiere/model/MLookup.java @@ -525,8 +525,7 @@ public final class MLookup extends Lookup implements Serializable directValue = null; } - if (CLogMgt.isLevelFinest()) - log.finest(m_info.KeyColumn + ": " + directValue + " - " + m_info); + if (log.isLoggable(Level.FINEST)) log.finest(m_info.KeyColumn + ": " + directValue + " - " + m_info); } catch (Exception e) { @@ -764,7 +763,7 @@ public final class MLookup extends Lookup implements Serializable if (CLogMgt.isLevelFiner()) log.finer(m_info.Column_ID + ", " + m_info.KeyColumn + ": " + sql.toString()); if (CLogMgt.isLevelFinest()) - log.finest(m_info.KeyColumn + ": " + sql); + if (log.isLoggable(Level.FINEST)) log.finest(m_info.KeyColumn + ": " + sql); // Reset m_lookup.clear(); diff --git a/org.adempiere.base/src/org/compiere/model/MRole.java b/org.adempiere.base/src/org/compiere/model/MRole.java index 9846a42198..8f119c8839 100644 --- a/org.adempiere.base/src/org/compiere/model/MRole.java +++ b/org.adempiere.base/src/org/compiere/model/MRole.java @@ -1982,7 +1982,7 @@ public final class MRole extends X_AD_Role if (recordWhere.length() > 0) { retSQL.append(" AND ").append(recordWhere); - log.finest("Record access - " + recordWhere); + if (log.isLoggable(Level.FINEST)) log.finest("Record access - " + recordWhere); } } // for all table info @@ -2042,7 +2042,7 @@ public final class MRole extends X_AD_Role retSQL.append(getDependentAccess(whereColumnName, includes, excludes)); // retSQL.append(orderBy); - log.finest(retSQL.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(retSQL.toString()); return retSQL.toString(); } // addAccessSQL @@ -2092,7 +2092,7 @@ public final class MRole extends X_AD_Role } where.append("))"); } - log.finest(where.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(where.toString()); return where.toString(); } // getDependentAccess diff --git a/org.adempiere.base/src/org/compiere/model/MSession.java b/org.adempiere.base/src/org/compiere/model/MSession.java index 611db98188..7c1375a3ef 100644 --- a/org.adempiere.base/src/org/compiere/model/MSession.java +++ b/org.adempiere.base/src/org/compiere/model/MSession.java @@ -293,7 +293,7 @@ public class MSession extends X_AD_Session else return null; // - log.finest("AD_ChangeLog_ID=" + AD_ChangeLog_ID + if (log.isLoggable(Level.FINEST)) log.finest("AD_ChangeLog_ID=" + AD_ChangeLog_ID + ", AD_Session_ID=" + getAD_Session_ID() + ", AD_Table_ID=" + AD_Table_ID + ", AD_Column_ID=" + AD_Column_ID + ": " + OldValue + " -> " + NewValue); diff --git a/org.adempiere.base/src/org/compiere/model/MTree.java b/org.adempiere.base/src/org/compiere/model/MTree.java index 4fd484f433..a8aba685e1 100644 --- a/org.adempiere.base/src/org/compiere/model/MTree.java +++ b/org.adempiere.base/src/org/compiere/model/MTree.java @@ -229,7 +229,7 @@ public class MTree extends MTree_Base sql.append(" ORDER BY COALESCE(tn.Parent_ID, -1), tn.SeqNo"); sql = new StringBuffer(MRole.getDefault().addAccessSQL(sql.toString(), "st", MRole.SQL_FULLYQUALIFIED, MRole.SQL_RO)); // SQL_RO for Org_ID = 0 } - log.finest(sql.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(sql.toString()); // The Node Loop PreparedStatement pstmt = null; ResultSet rs = null; @@ -280,7 +280,7 @@ public class MTree extends MTree_Base // Done with loading - add remainder from buffer if (m_buffer.size() != 0) { - log.finest("clearing buffer - Adding to: " + m_root); + if (log.isLoggable(Level.FINEST)) log.finest("clearing buffer - Adding to: " + m_root); for (int i = 0; i < m_buffer.size(); i++) { MTreeNode node = (MTreeNode)m_buffer.get(i); diff --git a/org.adempiere.base/src/org/compiere/model/MultiMap.java b/org.adempiere.base/src/org/compiere/model/MultiMap.java index 13eb594554..8cda4ea681 100644 --- a/org.adempiere.base/src/org/compiere/model/MultiMap.java +++ b/org.adempiere.base/src/org/compiere/model/MultiMap.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.logging.Level; import org.compiere.util.CLogger; @@ -262,7 +263,7 @@ public final class MultiMap implements Map, Serializable { Object k = m_keys.get(i); Object v = m_values.get(i); - log.finest(k==null ? "null" : k.toString() + "=" + v==null ? "null" : v.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(k==null ? "null" : k.toString() + "=" + v==null ? "null" : v.toString()); } } // printToLog diff --git a/org.adempiere.base/src/org/compiere/model/PO.java b/org.adempiere.base/src/org/compiere/model/PO.java index ce9d197982..fea1b09469 100644 --- a/org.adempiere.base/src/org/compiere/model/PO.java +++ b/org.adempiere.base/src/org/compiere/model/PO.java @@ -835,8 +835,7 @@ public abstract class PO + value + " - Reference_ID=" + p_info.getColumn(index).AD_Reference_Value_ID + validValues.toString()); } } - if (CLogMgt.isLevelFinest()) - log.finest(ColumnName + " = " + m_newValues[index] + " (OldValue="+m_oldValues[index]+")"); + if (log.isLoggable(Level.FINEST)) log.finest(ColumnName + " = " + m_newValues[index] + " (OldValue="+m_oldValues[index]+")"); } set_Keys (ColumnName, m_newValues[index]); @@ -940,7 +939,7 @@ public abstract class PO } } } - log.finest(ColumnName + " = " + m_newValues[index] + if (log.isLoggable(Level.FINEST)) log.finest(ColumnName + " = " + m_newValues[index] + " (" + (m_newValues[index]==null ? "-" : m_newValues[index].getClass().getName()) + ")"); set_Keys (ColumnName, m_newValues[index]); @@ -1276,7 +1275,7 @@ public abstract class PO */ protected void load (int ID, String trxName) { - log.finest("ID=" + ID); + if (log.isLoggable(Level.FINEST)) log.finest("ID=" + ID); if (ID > 0) { setKeyInfo(); @@ -1317,8 +1316,7 @@ public abstract class PO // // int index = -1; - if (CLogMgt.isLevelFinest()) - log.finest(get_WhereClause(true)); + if (log.isLoggable(Level.FINEST)) log.finest(get_WhereClause(true)); PreparedStatement pstmt = null; ResultSet rs = null; try @@ -1571,7 +1569,7 @@ public abstract class PO */ protected Object loadSpecial (ResultSet rs, int index) throws SQLException { - log.finest("(NOP) - " + p_info.getColumnName(index)); + if (log.isLoggable(Level.FINEST)) log.finest("(NOP) - " + p_info.getColumnName(index)); return null; } // loadSpecial @@ -1649,7 +1647,7 @@ public abstract class PO m_IDs = new Object[] {I_ZERO}; else m_IDs = new Object[] {ii}; - log.finest("(PK) " + ColumnName + "=" + ii); + if (log.isLoggable(Level.FINEST)) log.finest("(PK) " + ColumnName + "=" + ii); } else { @@ -1658,7 +1656,7 @@ public abstract class PO m_IDs = new Object[] {null}; else m_IDs = new Object[] {oo}; - log.finest("(PK) " + ColumnName + "=" + oo); + if (log.isLoggable(Level.FINEST)) log.finest("(PK) " + ColumnName + "=" + oo); } return; } @@ -1696,7 +1694,7 @@ public abstract class PO } else m_IDs[i] = get_Value(m_KeyColumns[i]); - log.finest("(FK) " + m_KeyColumns[i] + "=" + m_IDs[i]); + if (log.isLoggable(Level.FINEST)) log.finest("(FK) " + m_KeyColumns[i] + "=" + m_IDs[i]); } } // setKeyInfo @@ -2602,7 +2600,7 @@ public abstract class PO sql.append(" WHERE ").append(where); /** @todo status locking goes here */ - log.finest(sql.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(sql.toString()); int no = 0; if (isUseTimeoutForUpdate()) no = withValues ? DB.executeUpdateEx(sql.toString(), m_trxName, QUERY_TIME_OUT) @@ -3895,13 +3893,13 @@ public abstract class PO StringBuilder sb = new StringBuilder(" ").append(index); if (index < 0 || index >= get_ColumnCount()) { - log.finest(sb.append(": invalid").toString()); + if (log.isLoggable(Level.FINEST)) log.finest(sb.append(": invalid").toString()); return; } sb.append(": ").append(get_ColumnName(index)) .append(" = ").append(m_oldValues[index]) .append(" (").append(m_newValues[index]).append(")"); - log.finest(sb.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(sb.toString()); } // dump @@ -4037,7 +4035,7 @@ public abstract class PO */ private void lobAdd (Object value, int index, int displayType) { - log.finest("Value=" + value); + if (log.isLoggable(Level.FINEST)) log.finest("Value=" + value); PO_LOB lob = new PO_LOB (p_info.getTableName(), get_ColumnName(index), get_WhereClause(true), displayType, value); if (m_lobInfo == null) diff --git a/org.adempiere.base/src/org/compiere/model/Query.java b/org.adempiere.base/src/org/compiere/model/Query.java index b0b3078742..9576d66576 100644 --- a/org.adempiere.base/src/org/compiere/model/Query.java +++ b/org.adempiere.base/src/org/compiere/model/Query.java @@ -31,7 +31,6 @@ import java.util.Properties; import java.util.logging.Level; import org.adempiere.exceptions.DBException; -import org.compiere.util.CLogMgt; import org.compiere.util.CLogger; import org.compiere.util.DB; import org.compiere.util.Env; @@ -694,7 +693,7 @@ public class Query MRole role = MRole.getDefault(this.ctx, false); sql = role.addAccessSQL(sql, table.getTableName(), applyAccessFilterFullyQualified, applyAccessFilterRW); } - if (CLogMgt.isLevelFinest()) log.finest("TableName = "+table.getTableName()+"... SQL = " +sql); //red1 - to assist in debugging SQL + if (log.isLoggable(Level.FINEST)) log.finest("TableName = "+table.getTableName()+"... SQL = " +sql); //red1 - to assist in debugging SQL return sql; } @@ -706,21 +705,18 @@ public class Query if (this.onlyActiveRecords) { DB.setParameter(pstmt, i++, true); - if (log.isLoggable(Level.FINEST)) - log.finest("Parameter IsActive = Y"); + if (log.isLoggable(Level.FINEST)) log.finest("Parameter IsActive = Y"); } if (this.onlyClient_ID) { int AD_Client_ID = Env.getAD_Client_ID(ctx); DB.setParameter(pstmt, i++, AD_Client_ID); - if (log.isLoggable(Level.FINEST)) - log.finest("Parameter AD_Client_ID = "+AD_Client_ID); + if (log.isLoggable(Level.FINEST)) log.finest("Parameter AD_Client_ID = "+AD_Client_ID); } if (this.onlySelection_ID > 0) { DB.setParameter(pstmt, i++, this.onlySelection_ID); - if (log.isLoggable(Level.FINEST)) - log.finest("Parameter Selection AD_PInstance_ID = "+this.onlySelection_ID); + if (log.isLoggable(Level.FINEST)) log.finest("Parameter Selection AD_PInstance_ID = "+this.onlySelection_ID); } return pstmt.executeQuery(); } diff --git a/org.adempiere.base/src/org/compiere/model/Tax.java b/org.adempiere.base/src/org/compiere/model/Tax.java index 3b2c1e034f..98580f9b2b 100644 --- a/org.adempiere.base/src/org/compiere/model/Tax.java +++ b/org.adempiere.base/src/org/compiere/model/Tax.java @@ -496,7 +496,7 @@ public class Tax for (int i = 0; i < taxes.length; i++) { MTax tax = taxes[i]; - log.finest(tax.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(tax.toString()); // if (tax.getC_TaxCategory_ID() != C_TaxCategory_ID || !tax.isActive() @@ -507,15 +507,15 @@ public class Tax if (!IsSOTrx && MTax.SOPOTYPE_SalesTax.equals(tax.getSOPOType())) continue; - log.finest("From Country - " + (tax.getC_Country_ID() == lFrom.getC_Country_ID() + if (log.isLoggable(Level.FINEST)) log.finest("From Country - " + (tax.getC_Country_ID() == lFrom.getC_Country_ID() || tax.getC_Country_ID() == 0)); - log.finest("From Region - " + (tax.getC_Region_ID() == lFrom.getC_Region_ID() + if (log.isLoggable(Level.FINEST)) log.finest("From Region - " + (tax.getC_Region_ID() == lFrom.getC_Region_ID() || tax.getC_Region_ID() == 0)); - log.finest("To Country - " + (tax.getTo_Country_ID() == lTo.getC_Country_ID() + if (log.isLoggable(Level.FINEST)) log.finest("To Country - " + (tax.getTo_Country_ID() == lTo.getC_Country_ID() || tax.getTo_Country_ID() == 0)); - log.finest("To Region - " + (tax.getTo_Region_ID() == lTo.getC_Region_ID() + if (log.isLoggable(Level.FINEST)) log.finest("To Region - " + (tax.getTo_Region_ID() == lTo.getC_Region_ID() || tax.getTo_Region_ID() == 0)); - log.finest("Date valid - " + (!tax.getValidFrom().after(billDate))); + if (log.isLoggable(Level.FINEST)) log.finest("Date valid - " + (!tax.getValidFrom().after(billDate))); // From Country if ((tax.getC_Country_ID() == lFrom.getC_Country_ID() diff --git a/org.adempiere.base/src/org/compiere/print/DataEngine.java b/org.adempiere.base/src/org/compiere/print/DataEngine.java index 126ff99be8..aaae8e1771 100644 --- a/org.adempiere.base/src/org/compiere/print/DataEngine.java +++ b/org.adempiere.base/src/org/compiere/print/DataEngine.java @@ -229,8 +229,7 @@ public class DataEngine ArrayList orderColumns = new ArrayList(orderAD_Column_IDs.length); for (int i = 0; i < orderAD_Column_IDs.length; i++) { - if (log.isLoggable(Level.FINEST)) - log.finest("Order AD_Column_ID=" + orderAD_Column_IDs[i]); + if (log.isLoggable(Level.FINEST)) log.finest("Order AD_Column_ID=" + orderAD_Column_IDs[i]); orderColumns.add(""); // initial value overwritten with fully qualified name } @@ -627,8 +626,7 @@ public class DataEngine if (columns.size() == 0) { log.log(Level.SEVERE, "No Colums - Delete Report Format " + reportName + " and start again"); - if (log.isLoggable(Level.FINEST)) - log.finest("No Colums - SQL=" + sql + " - ID=" + format.get_ID()); + if (log.isLoggable(Level.FINEST)) log.finest("No Colums - SQL=" + sql + " - ID=" + format.get_ID()); return null; } diff --git a/org.adempiere.base/src/org/compiere/print/layout/LayoutEngine.java b/org.adempiere.base/src/org/compiere/print/layout/LayoutEngine.java index d64c25e10b..baa1e2a88c 100644 --- a/org.adempiere.base/src/org/compiere/print/layout/LayoutEngine.java +++ b/org.adempiere.base/src/org/compiere/print/layout/LayoutEngine.java @@ -629,16 +629,14 @@ public class LayoutEngine implements Pageable, Printable, Doc if (isYspaceFor(m_maxHeightSinceNewLine[m_area])) { m_position[m_area].setLocation(xPos, m_position[m_area].y + m_maxHeightSinceNewLine[m_area]); - if (log.isLoggable(Level.FINEST)) - log.finest("Page=" + m_pageNo + " [" + m_area + "] " + m_position[m_area].x + "/" + m_position[m_area].y); + if (log.isLoggable(Level.FINEST)) log.finest("Page=" + m_pageNo + " [" + m_area + "] " + m_position[m_area].x + "/" + m_position[m_area].y); } else if (m_area == AREA_CONTENT) { - log.finest("Not enough Y space " + if (log.isLoggable(Level.FINEST)) log.finest("Not enough Y space " + m_lastHeight[m_area] + " - remaining " + getYspace() + " - Area=" + m_area); newPage(true, false); - if (log.isLoggable(Level.FINEST)) - log.finest("Page=" + m_pageNo + " [" + m_area + "] " + m_position[m_area].x + "/" + m_position[m_area].y); + if (log.isLoggable(Level.FINEST)) log.finest("Page=" + m_pageNo + " [" + m_area + "] " + m_position[m_area].x + "/" + m_position[m_area].y); } else // footer/header { @@ -777,8 +775,7 @@ public class LayoutEngine implements Pageable, Printable, Doc else if (m_area == AREA_FOOTER) part = m_footer; m_position[m_area].setLocation(part.x + p.getX(), part.y + p.getY()); - if (log.isLoggable(Level.FINEST)) - log.finest("Page=" + m_pageNo + " [" + m_area + "] " + m_position[m_area].x + "/" + m_position[m_area].y); + if (log.isLoggable(Level.FINEST)) log.finest("Page=" + m_pageNo + " [" + m_area + "] " + m_position[m_area].x + "/" + m_position[m_area].y); } // setPosition /** @@ -807,8 +804,7 @@ public class LayoutEngine implements Pageable, Printable, Doc protected void setX (float x) { m_position[m_area].x = x; - if (log.isLoggable(Level.FINEST)) - log.finest("Page=" + m_pageNo + " [" + m_area + "] " + m_position[m_area].x + "/" + m_position[m_area].y); + if (log.isLoggable(Level.FINEST)) log.finest("Page=" + m_pageNo + " [" + m_area + "] " + m_position[m_area].x + "/" + m_position[m_area].y); } // setX /** @@ -820,8 +816,7 @@ public class LayoutEngine implements Pageable, Printable, Doc if (xOffset == 0f) return; m_position[m_area].x += xOffset; - if (log.isLoggable(Level.FINEST)) - log.finest("Page=" + m_pageNo + " [" + m_area + "] " + m_position[m_area].x + "/" + m_position[m_area].y); + if (log.isLoggable(Level.FINEST)) log.finest("Page=" + m_pageNo + " [" + m_area + "] " + m_position[m_area].x + "/" + m_position[m_area].y); } // addX /** @@ -840,8 +835,7 @@ public class LayoutEngine implements Pageable, Printable, Doc protected void setY (int y) { m_position[m_area].y = y; - if (log.isLoggable(Level.FINEST)) - log.finest("Page=" + m_pageNo + " [" + m_area + "] " + m_position[m_area].x + "/" + m_position[m_area].y); + if (log.isLoggable(Level.FINEST)) log.finest("Page=" + m_pageNo + " [" + m_area + "] " + m_position[m_area].x + "/" + m_position[m_area].y); } // setY /** @@ -855,16 +849,14 @@ public class LayoutEngine implements Pageable, Printable, Doc if (isYspaceFor(yOffset)) { m_position[m_area].y += yOffset; - if (log.isLoggable(Level.FINEST)) - log.finest("Page=" + m_pageNo + " [" + m_area + "] " + m_position[m_area].x + "/" + m_position[m_area].y); + if (log.isLoggable(Level.FINEST)) log.finest("Page=" + m_pageNo + " [" + m_area + "] " + m_position[m_area].x + "/" + m_position[m_area].y); } else if (m_area == AREA_CONTENT) { - log.finest("Not enough Y space " + if (log.isLoggable(Level.FINEST)) log.finest("Not enough Y space " + m_lastHeight[m_area] + " - remaining " + getYspace() + " - Area=" + m_area); newPage(true, true); - if (log.isLoggable(Level.FINEST)) - log.finest("Page=" + m_pageNo + " [" + m_area + "] " + m_position[m_area].x + "/" + m_position[m_area].y); + if (log.isLoggable(Level.FINEST)) log.finest("Page=" + m_pageNo + " [" + m_area + "] " + m_position[m_area].x + "/" + m_position[m_area].y); } else { @@ -1164,15 +1156,13 @@ public class LayoutEngine implements Pageable, Printable, Doc { if (!isXspaceFor(m_lastWidth[m_area])) { - if (log.isLoggable(Level.FINEST)) - log.finest("Not enough X space for " + if (log.isLoggable(Level.FINEST)) log.finest("Not enough X space for " + m_lastWidth[m_area] + " - remaining " + getXspace() + " - Area=" + m_area); newLine (); } if (m_area == AREA_CONTENT && !isYspaceFor(m_lastHeight[m_area])) { - if (log.isLoggable(Level.FINEST)) - log.finest("Not enough Y space " + if (log.isLoggable(Level.FINEST)) log.finest("Not enough Y space " + m_lastHeight[m_area] + " - remaining " + getYspace() + " - Area=" + m_area); newPage (true, true); } @@ -1284,15 +1274,13 @@ public class LayoutEngine implements Pageable, Printable, Doc if (!isXspaceFor(m_lastWidth[m_area])) { - if (log.isLoggable(Level.FINEST)) - log.finest("Not enough X space for " + if (log.isLoggable(Level.FINEST)) log.finest("Not enough X space for " + m_lastWidth[m_area] + " - remaining " + getXspace() + " - Area=" + m_area); newLine (); } if (m_area == AREA_CONTENT && !isYspaceFor(m_lastHeight[m_area])) { - if (log.isLoggable(Level.FINEST)) - log.finest("Not enough Y space " + if (log.isLoggable(Level.FINEST)) log.finest("Not enough Y space " + m_lastHeight[m_area] + " - remaining " + getYspace() + " - Area=" + m_area); newPage (true, false); } diff --git a/org.adempiere.base/src/org/compiere/print/layout/PrintElement.java b/org.adempiere.base/src/org/compiere/print/layout/PrintElement.java index dcf68c5a4a..b232a6bea3 100644 --- a/org.adempiere.base/src/org/compiere/print/layout/PrintElement.java +++ b/org.adempiere.base/src/org/compiere/print/layout/PrintElement.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.compiere.model.MQuery; import org.compiere.print.MPrintFormatItem; -import org.compiere.util.CLogMgt; import org.compiere.util.CLogger; /** @@ -277,8 +276,7 @@ public abstract class PrintElement implements ImageObserver, Serializable { // copied from java.awt.component m_imageNotLoaded = (infoflags & (ALLBITS|ABORT)) == 0; - if (CLogMgt.isLevelFinest()) - log.finest("Flags=" + infoflags + if (log.isLoggable(Level.FINEST)) log.finest("Flags=" + infoflags + ", x=" + x + ", y=" + y + ", width=" + width + ", height=" + height + " - NotLoaded=" + m_imageNotLoaded); return m_imageNotLoaded; diff --git a/org.adempiere.base/src/org/compiere/print/layout/StringElement.java b/org.adempiere.base/src/org/compiere/print/layout/StringElement.java index e7b76c90c6..f20be99995 100644 --- a/org.adempiere.base/src/org/compiere/print/layout/StringElement.java +++ b/org.adempiere.base/src/org/compiere/print/layout/StringElement.java @@ -29,6 +29,7 @@ import java.text.AttributedCharacterIterator; import java.text.AttributedString; import java.text.CharacterIterator; import java.util.Properties; +import java.util.logging.Level; import java.util.regex.Pattern; import org.compiere.model.MQuery; @@ -65,7 +66,7 @@ public class StringElement extends PrintElement public StringElement (String inText, Font font, Paint paint, NamePair ID, boolean translateText) { super(); - log.finest("Text=" + inText + ", ID=" + ID + ", Translate=" + translateText); + if (log.isLoggable(Level.FINEST)) log.finest("Text=" + inText + ", ID=" + ID + ", Translate=" + translateText); m_font = font; m_paint = paint; if (translateText) @@ -88,7 +89,7 @@ public class StringElement extends PrintElement m_string_paper[i] = new AttributedString(line); if (line.length() == 0) continue; - log.finest(" - line=" + i + " - " + line); + if (log.isLoggable(Level.FINEST)) log.finest(" - line=" + i + " - " + line); m_string_paper[i].addAttribute(TextAttribute.FONT, font); m_string_paper[i].addAttribute(TextAttribute.FOREGROUND, paint); if (m_ID != null && i == 0) // first line only - create special Attributed String @@ -131,7 +132,7 @@ public class StringElement extends PrintElement public StringElement (Object content, Font font, Paint paint, NamePair ID, String label, String labelSuffix) { super(); - log.finest("Label=" + label + "|" + labelSuffix + if (log.isLoggable(Level.FINEST)) log.finest("Label=" + label + "|" + labelSuffix + ", Content=" + content + ", ID=" + ID); m_font = font; m_paint = paint; @@ -163,7 +164,7 @@ public class StringElement extends PrintElement m_string_paper[i] = new AttributedString(line); if (line.length() == 0) continue; - log.finest(" - line=" + i + " - " + line); + if (log.isLoggable(Level.FINEST)) log.finest(" - line=" + i + " - " + line); m_string_paper[i].addAttribute(TextAttribute.FONT, font); m_string_paper[i].addAttribute(TextAttribute.FOREGROUND, paint); if (m_ID != null && i == 0) // first line only - create special Attributed String diff --git a/org.adempiere.base/src/org/compiere/print/layout/TableElement.java b/org.adempiere.base/src/org/compiere/print/layout/TableElement.java index 70957970ee..65c7142ed2 100644 --- a/org.adempiere.base/src/org/compiere/print/layout/TableElement.java +++ b/org.adempiere.base/src/org/compiere/print/layout/TableElement.java @@ -308,7 +308,7 @@ public class TableElement extends PrintElement if (m_additionalLines.containsKey(new Integer(dataCol))) { col = ((Integer)m_additionalLines.get(new Integer(dataCol))).intValue(); - log.finest("DataColumn=" + dataCol + ", BelowColumn=" + col); + if (log.isLoggable(Level.FINEST)) log.finest("DataColumn=" + dataCol + ", BelowColumn=" + col); } float colWidth = 0; for (int row = 0; row < rows; row++) @@ -538,14 +538,14 @@ public class TableElement extends PrintElement { if (origWidth.compareTo(new Float(colWidth)) >= 0) { - log.finest("Same Width - Col=" + col + if (log.isLoggable(Level.FINEST)) log.finest("Same Width - Col=" + col + " - OrigWidth=" + origWidth + " - Width=" + colWidth + " - Total=" + p_width); } else { m_columnWidths.set(col, new Float(colWidth)); p_width += (colWidth - origWidth.floatValue()); - log.finest("New Width - Col=" + col + if (log.isLoggable(Level.FINEST)) log.finest("New Width - Col=" + col + " - OrigWidth=" + origWidth + " - Width=" + colWidth + " - Total=" + p_width); } } @@ -555,7 +555,7 @@ public class TableElement extends PrintElement { m_columnWidths.add(new Float(colWidth)); p_width += colWidth; - log.finest("Width - Col=" + dataCol + if (log.isLoggable(Level.FINEST)) log.finest("Width - Col=" + dataCol + " - Width=" + colWidth + " - Total=" + p_width); } } // for all columns @@ -595,7 +595,7 @@ public class TableElement extends PrintElement // One Page on Y | Axis if (m_firstPage.height >= p_height && m_pageBreak.size() == 0) { - log.finest("Page Y=1 - PageHeight=" + m_firstPage.height + " - TableHeight=" + p_height); + if (log.isLoggable(Level.FINEST)) log.finest("Page Y=1 - PageHeight=" + m_firstPage.height + " - TableHeight=" + p_height); m_firstRowOnPage.add(new Integer(0)); // Y m_pageHeight.add(new Float(p_height)); // Y index only } @@ -623,7 +623,7 @@ public class TableElement extends PrintElement { if (availableHeight > 40 && rowHeight > 40) { - log.finest("- Split (leave on current) Row=" + dataRow + if (log.isLoggable(Level.FINEST)) log.finest("- Split (leave on current) Row=" + dataRow + " - Available=" + availableHeight + ", RowHeight=" + rowHeight); // if (splitRow (dataRow)) // addlRows += 1; @@ -638,10 +638,10 @@ public class TableElement extends PrintElement if (!firstPage) { m_pageHeight.add(new Float(usedHeight)); // Y index only - log.finest("Page Y=" + m_pageHeight.size() + if (log.isLoggable(Level.FINEST)) log.finest("Page Y=" + m_pageHeight.size() + " - PageHeight=" + usedHeight); } - log.finest("Page Y=" + m_firstRowOnPage.size() + if (log.isLoggable(Level.FINEST)) log.finest("Page Y=" + m_firstRowOnPage.size() + " - Row=" + dataRow + " - force=" + isPageBreak(dataRow)); firstPage = false; // @@ -652,23 +652,23 @@ public class TableElement extends PrintElement usedHeight += rowHeight; if (availableHeight < 0) { - log.finest("- Split (move to next) Row=" + dataRow + if (log.isLoggable(Level.FINEST)) log.finest("- Split (move to next) Row=" + dataRow + " - Available=" + availableHeight + ", RowHeight=" + rowHeight); } - log.finest("Page Y=" + m_pageHeight.size() + if (log.isLoggable(Level.FINEST)) log.finest("Page Y=" + m_pageHeight.size() + ", Row=" + dataRow + ",AddlRows=" + addlRows + ", Height=" + rowHeight + " - Available=" + availableHeight + ", Used=" + usedHeight); } // for all rows m_pageHeight.add(new Float(usedHeight)); // Y index only - log.finest("Page Y=" + m_pageHeight.size() + if (log.isLoggable(Level.FINEST)) log.finest("Page Y=" + m_pageHeight.size() + " - PageHeight=" + usedHeight); } // multiple Y | pages // One page on - X Axis if (m_firstPage.width >= p_width) { - log.finest("Page X=1 - PageWidth=" + m_firstPage.width + if (log.isLoggable(Level.FINEST)) log.finest("Page X=1 - PageWidth=" + m_firstPage.width + " - TableWidth=" + p_width); m_firstColumnOnPage.add(new Integer(0)); // X // @@ -689,7 +689,7 @@ public class TableElement extends PrintElement distributeColumns (availableWidth, lastStart, col); // m_firstColumnOnPage.add(new Integer(col)); // X - log.finest("Page X=" + m_firstColumnOnPage.size() + if (log.isLoggable(Level.FINEST)) log.finest("Page X=" + m_firstColumnOnPage.size() + " - Col=" + col); lastStart = col; availableWidth = m_firstPage.width; // Width is the same on all pages @@ -722,7 +722,7 @@ public class TableElement extends PrintElement */ private void distributeColumns (int availableWidth, int fromCol, int toCol) { - log.finest("Available=" + availableWidth + ", Columns " + fromCol + "->" + toCol); + if (log.isLoggable(Level.FINEST)) log.finest("Available=" + availableWidth + ", Columns " + fromCol + "->" + toCol); int start = fromCol; if (fromCol == 0 && m_repeatedColumns > 0) start = m_repeatedColumns; @@ -734,7 +734,7 @@ public class TableElement extends PrintElement // distribute proportionally (does not increase zero width columns) for (int x = 0; remainingWidth > 0 && x < 5; x++) // max 4 iterations { - log.finest("TotalWidth=" + totalWidth + ", Remaining=" + remainingWidth); + if (log.isLoggable(Level.FINEST)) log.finest("TotalWidth=" + totalWidth + ", Remaining=" + remainingWidth); for (int col = start; col < toCol && remainingWidth != 0; col++) { int columnWidth = ((Float)m_columnWidths.get(col)).intValue(); @@ -751,7 +751,7 @@ public class TableElement extends PrintElement m_columnWidths.set(col, new Float(columnWidth+additionalPart)); remainingWidth -= additionalPart; } - log.finest(" col=" + col + " - From " + columnWidth + " to " + m_columnWidths.get(col)); + if (log.isLoggable(Level.FINEST)) log.finest(" col=" + col + " - From " + columnWidth + " to " + m_columnWidths.get(col)); } } } @@ -762,7 +762,7 @@ public class TableElement extends PrintElement if (columnWidth > 0) { m_columnWidths.set(c, new Float(columnWidth+remainingWidth)); - log.finest("Final col=" + c + " - From " + columnWidth + " to " + m_columnWidths.get(c)); + if (log.isLoggable(Level.FINEST)) log.finest("Final col=" + c + " - From " + columnWidth + " to " + m_columnWidths.get(c)); remainingWidth = 0; } } @@ -1201,7 +1201,7 @@ public class TableElement extends PrintElement if (pageYindex+1 < m_firstRowOnPage.size()) nextPageRow = ((Integer)m_firstRowOnPage.get(pageYindex+1)).intValue(); if (DEBUG_PRINT) - log.finest("Col=" + firstColumn + "-" + (nextPageColumn-1) + if (log.isLoggable(Level.FINEST)) log.finest("Col=" + firstColumn + "-" + (nextPageColumn-1) + ", Row=" + firstRow + "-" + (nextPageRow-1)); // Top Left @@ -1211,7 +1211,7 @@ public class TableElement extends PrintElement startX += pageXindex == 0 ? m_firstPage.x : m_nextPages.x; startY += pageYindex == 0 ? m_firstPage.y : m_nextPages.y; if (DEBUG_PRINT) - log.finest("PageStart=" + pageStart + ", StartTable x=" + startX + ", y=" + startY); + if (log.isLoggable(Level.FINEST)) log.finest("PageStart=" + pageStart + ", StartTable x=" + startX + ", y=" + startY); // paint first fixed volumns boolean firstColumnPrint = true; diff --git a/org.adempiere.base/src/org/compiere/process/ServerProcessCtl.java b/org.adempiere.base/src/org/compiere/process/ServerProcessCtl.java index 6e964706a8..e866e8e1b2 100644 --- a/org.adempiere.base/src/org/compiere/process/ServerProcessCtl.java +++ b/org.adempiere.base/src/org/compiere/process/ServerProcessCtl.java @@ -306,7 +306,7 @@ public class ServerProcessCtl implements Runnable { if (server != null) { // See ServerBean m_pi = server.workflow (Env.getRemoteCallCtx(Env.getCtx()), m_pi, AD_Workflow_ID); - log.finest("server => " + m_pi); + if (log.isLoggable(Level.FINEST)) log.finest("server => " + m_pi); started = true; } } @@ -360,7 +360,7 @@ public class ServerProcessCtl implements Runnable { { // See ServerBean m_pi = server.process (Env.getRemoteCallCtx(Env.getCtx()), m_pi); - log.finest("server => " + m_pi); + if (log.isLoggable(Level.FINEST)) log.finest("server => " + m_pi); started = true; } } @@ -421,7 +421,7 @@ public class ServerProcessCtl implements Runnable { if (server != null) { // See ServerBean m_pi = server.dbProcess(Env.getRemoteCallCtx(Env.getCtx()), m_pi, ProcedureName); - log.finest("server => " + m_pi); + if (log.isLoggable(Level.FINEST)) log.finest("server => " + m_pi); started = true; } } diff --git a/org.adempiere.base/src/org/compiere/report/FinReport.java b/org.adempiere.base/src/org/compiere/report/FinReport.java index ab37f9f7ec..7873038b42 100644 --- a/org.adempiere.base/src/org/compiere/report/FinReport.java +++ b/org.adempiere.base/src/org/compiere/report/FinReport.java @@ -470,7 +470,7 @@ public class FinReport extends SvrProcess // Parameter Where select.append(m_parameterWhere); - log.finest("Line=" + line + ",Col=" + line + ": " + select); + if (log.isLoggable(Level.FINEST)) log.finest("Line=" + line + ",Col=" + line + ": " + select); // Update SET portion if (update.length() > 0) @@ -478,7 +478,7 @@ public class FinReport extends SvrProcess update.append("Col_").append(col) .append(" = (").append(select).append(")"); // - log.finest(info.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(info.toString()); } // Update Line Values if (update.length() > 0) @@ -490,7 +490,7 @@ public class FinReport extends SvrProcess int no = DB.executeUpdate(update.toString(), get_TrxName()); if (no != 1) log.log(Level.SEVERE, "#=" + no + " for " + update); - log.finest(update.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(update.toString()); } } // insertLine @@ -553,7 +553,7 @@ public class FinReport extends SvrProcess else { log.fine("(+) Line=" + line + " - " + m_lines[line]); - log.finest ("(+) " + sb.toString ()); + if (log.isLoggable(Level.FINEST)) log.finest ("(+) " + sb.toString ()); } } else // No Add (subtract, percent) @@ -629,7 +629,7 @@ public class FinReport extends SvrProcess else { log.fine("(x) Line=" + line + " - " + m_lines[line]); - log.finest (sb.toString()); + if (log.isLoggable(Level.FINEST)) log.finest (sb.toString()); } } } // for all lines @@ -705,7 +705,7 @@ public class FinReport extends SvrProcess else { log.fine("Col=" + col + " - " + m_columns[col]); - log.finest (sb.toString ()); + if (log.isLoggable(Level.FINEST)) log.finest (sb.toString ()); } } // for all columns @@ -719,7 +719,7 @@ public class FinReport extends SvrProcess */ private String getLineIDs (int fromID, int toID) { - log.finest("From=" + fromID + " To=" + toID); + if (log.isLoggable(Level.FINEST)) log.finest("From=" + fromID + " To=" + toID); int firstPA_ReportLine_ID = 0; int lastPA_ReportLine_ID = 0; @@ -745,7 +745,7 @@ public class FinReport extends SvrProcess for (int line = 0; line < m_lines.length; line++) { int PA_ReportLine_ID = m_lines[line].getPA_ReportLine_ID(); - log.finest("Add=" + addToList + if (log.isLoggable(Level.FINEST)) log.finest("Add=" + addToList + " ID=" + PA_ReportLine_ID + " - " + m_lines[line]); if (addToList) { @@ -1114,7 +1114,7 @@ public class FinReport extends SvrProcess // } int no = DB.executeUpdate(insert.toString(), get_TrxName()); - log.finest("Trx #=" + no + " - " + insert); + if (log.isLoggable(Level.FINEST)) log.finest("Trx #=" + no + " - " + insert); if (no == 0) return; } // insertLineTrx diff --git a/org.adempiere.base/src/org/compiere/report/FinStatement.java b/org.adempiere.base/src/org/compiere/report/FinStatement.java index db858fc676..d9857e3b15 100644 --- a/org.adempiere.base/src/org/compiere/report/FinStatement.java +++ b/org.adempiere.base/src/org/compiere/report/FinStatement.java @@ -317,7 +317,7 @@ public class FinStatement extends SvrProcess // int no = DB.executeUpdate(sb.toString(), get_TrxName()); log.fine("#" + no + " (Account_ID=" + p_Account_ID + ")"); - log.finest(sb.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(sb.toString()); } // createBalanceLine /** @@ -339,7 +339,7 @@ public class FinStatement extends SvrProcess // int no = DB.executeUpdate(sb.toString(), get_TrxName()); log.fine("#" + no); - log.finest(sb.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(sb.toString()); // Set Name,Description String sql_select; @@ -365,7 +365,7 @@ public class FinStatement extends SvrProcess // no = DB.executeUpdate(sb.toString(), get_TrxName()); log.fine("Name #" + no); - log.finest("Name - " + sb); + if (log.isLoggable(Level.FINEST)) log.finest("Name - " + sb); } // createDetailLines diff --git a/org.adempiere.base/src/org/compiere/report/MReportColumnSet.java b/org.adempiere.base/src/org/compiere/report/MReportColumnSet.java index 11526e4c45..1e88219f45 100644 --- a/org.adempiere.base/src/org/compiere/report/MReportColumnSet.java +++ b/org.adempiere.base/src/org/compiere/report/MReportColumnSet.java @@ -88,7 +88,7 @@ public class MReportColumnSet extends X_PA_ReportColumnSet // m_columns = new MReportColumn[list.size()]; list.toArray(m_columns); - log.finest("ID=" + getPA_ReportColumnSet_ID() + if (log.isLoggable(Level.FINEST)) log.finest("ID=" + getPA_ReportColumnSet_ID() + " - Size=" + list.size()); } // loadColumns diff --git a/org.adempiere.base/src/org/compiere/report/MReportLine.java b/org.adempiere.base/src/org/compiere/report/MReportLine.java index b474fcf1c4..35a6b39614 100644 --- a/org.adempiere.base/src/org/compiere/report/MReportLine.java +++ b/org.adempiere.base/src/org/compiere/report/MReportLine.java @@ -106,7 +106,7 @@ public class MReportLine extends X_PA_ReportLine // m_sources = new MReportSource[list.size()]; list.toArray(m_sources); - log.finest("ID=" + getPA_ReportLine_ID() + if (log.isLoggable(Level.FINEST)) log.finest("ID=" + getPA_ReportLine_ID() + " - Size=" + list.size()); } // loadSources diff --git a/org.adempiere.base/src/org/compiere/report/MReportLineSet.java b/org.adempiere.base/src/org/compiere/report/MReportLineSet.java index e9228a2afd..b72160c9a5 100644 --- a/org.adempiere.base/src/org/compiere/report/MReportLineSet.java +++ b/org.adempiere.base/src/org/compiere/report/MReportLineSet.java @@ -90,7 +90,7 @@ public class MReportLineSet extends X_PA_ReportLineSet // m_lines = new MReportLine[list.size()]; list.toArray(m_lines); - log.finest("ID=" + getPA_ReportLineSet_ID() + if (log.isLoggable(Level.FINEST)) log.finest("ID=" + getPA_ReportLineSet_ID() + " - Size=" + list.size()); } // loadColumns diff --git a/org.adempiere.base/src/org/compiere/report/MReportTree.java b/org.adempiere.base/src/org/compiere/report/MReportTree.java index e2993c3aae..7e6f9c5bc9 100644 --- a/org.adempiere.base/src/org/compiere/report/MReportTree.java +++ b/org.adempiere.base/src/org/compiere/report/MReportTree.java @@ -233,7 +233,7 @@ public class MReportTree String ColumnName = MAcctSchemaElement.getColumnName(m_ElementType); // MTreeNode node = m_tree.getRoot().findNode(ID); - log.finest("Root=" + node); + if (log.isLoggable(Level.FINEST)) log.finest("Root=" + node); // StringBuffer result = null; if (node != null && node.isSummary ()) @@ -254,10 +254,10 @@ public class MReportTree sb.append (ColumnName); sb.append ('='); sb.append (nn.getNode_ID ()); - log.finest ("- " + nn); + if (log.isLoggable(Level.FINEST)) log.finest ("- " + nn); } else - log.finest ("- skipped parent (" + nn + ")"); + if (log.isLoggable(Level.FINEST)) log.finest ("- skipped parent (" + nn + ")"); } result = new StringBuffer (" ( "); result.append (sb); @@ -266,7 +266,7 @@ public class MReportTree else // not found or not summary result = new StringBuffer (ColumnName).append("=").append(ID); // - log.finest(result.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(result.toString()); return result.toString(); } // getWhereClause @@ -281,7 +281,7 @@ public class MReportTree ArrayList list = new ArrayList(); // MTreeNode node = m_tree.getRoot().findNode(ID); - log.finest("Root=" + node); + if (log.isLoggable(Level.FINEST)) log.finest("Root=" + node); // if (node != null && node.isSummary()) { @@ -292,10 +292,10 @@ public class MReportTree if (!nn.isSummary()) { list.add(new Integer(nn.getNode_ID())); - log.finest("- " + nn); + if (log.isLoggable(Level.FINEST)) log.finest("- " + nn); } else - log.finest("- skipped parent (" + nn + ")"); + if (log.isLoggable(Level.FINEST)) log.finest("- skipped parent (" + nn + ")"); } } else // not found or not summary diff --git a/org.adempiere.base/src/org/compiere/util/Secure.java b/org.adempiere.base/src/org/compiere/util/Secure.java index 7094458925..6f0473d528 100644 --- a/org.adempiere.base/src/org/compiere/util/Secure.java +++ b/org.adempiere.base/src/org/compiere/util/Secure.java @@ -117,7 +117,7 @@ public class Secure implements SecureInterface } catch (Exception e) { - log.finest(hexString + " - " + e.getLocalizedMessage()); + if (log.isLoggable(Level.FINEST)) log.finest(hexString + " - " + e.getLocalizedMessage()); } return null; } // convertToHexString diff --git a/org.adempiere.base/src/org/compiere/util/Trx.java b/org.adempiere.base/src/org/compiere/util/Trx.java index 3716080167..204c760919 100644 --- a/org.adempiere.base/src/org/compiere/util/Trx.java +++ b/org.adempiere.base/src/org/compiere/util/Trx.java @@ -203,7 +203,7 @@ public class Trx if (conn == null) return; m_connection = conn; - log.finest("Connection=" + conn); + if (log.isLoggable(Level.FINEST)) log.finest("Connection=" + conn); try { m_connection.setAutoCommit(false); diff --git a/org.adempiere.base/src/org/compiere/util/WebUtil.java b/org.adempiere.base/src/org/compiere/util/WebUtil.java index 6852a97529..d469428928 100644 --- a/org.adempiere.base/src/org/compiere/util/WebUtil.java +++ b/org.adempiere.base/src/org/compiere/util/WebUtil.java @@ -318,7 +318,7 @@ public final class WebUtil } log.finest(parameter + "=" + data + " -> " + retValue + " == " + debug); **/ - log.finest(parameter + "=" + data + " -> " + retValue); + if (log.isLoggable(Level.FINEST)) log.finest(parameter + "=" + data + " -> " + retValue); return retValue; } // getParameter diff --git a/org.adempiere.install/src/org/compiere/install/ConfigurationData.java b/org.adempiere.install/src/org/compiere/install/ConfigurationData.java index d37f85cfcc..c31c87754e 100644 --- a/org.adempiere.install/src/org/compiere/install/ConfigurationData.java +++ b/org.adempiere.install/src/org/compiere/install/ConfigurationData.java @@ -809,7 +809,7 @@ public class ConfigurationData p_properties.setProperty("ADEMPIERE_DATE_VERSION", Adempiere.DATE_VERSION); p_properties.setProperty("ADEMPIERE_DB_VERSION", Adempiere.DB_VERSION); - log.finest(p_properties.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(p_properties.toString()); // Before we save, load Ini Ini.setClient(false); diff --git a/org.adempiere.replication.server/src/org/adempiere/server/rpl/imp/TopicListener.java b/org.adempiere.replication.server/src/org/adempiere/server/rpl/imp/TopicListener.java index 464a4c8021..35a5fee86c 100644 --- a/org.adempiere.replication.server/src/org/adempiere/server/rpl/imp/TopicListener.java +++ b/org.adempiere.replication.server/src/org/adempiere/server/rpl/imp/TopicListener.java @@ -31,6 +31,7 @@ package org.adempiere.server.rpl.imp; import java.util.Properties; +import java.util.logging.Level; import javax.jms.Connection; import javax.jms.JMSException; @@ -190,14 +191,14 @@ public class TopicListener implements MessageListener { public void run() throws JMSException { ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory( url ); - log.finest("ActiveMQConnectionFactory = " + factory); + if (log.isLoggable(Level.FINEST)) log.finest("ActiveMQConnectionFactory = " + factory); if (userName !=null && password !=null) { conn = factory.createConnection(userName, password); } else { conn = factory.createConnection(); } - log.finest("conn = " + conn ); + if (log.isLoggable(Level.FINEST)) log.finest("conn = " + conn ); if (conn.getClientID()==null) { @@ -233,13 +234,14 @@ public class TopicListener implements MessageListener { session = conn.createSession(true, Session.AUTO_ACKNOWLEDGE); // TODO - could be parameter - log.finest("session = " + session ); - - log.finest("topicName = " + topicName ); - log.finest("subscriptionName = " + subscriptionName); + if (log.isLoggable(Level.FINEST)){ + log.finest("session = " + session ); + log.finest("topicName = " + topicName ); + log.finest("subscriptionName = " + subscriptionName); + } topic = session.createTopic( topicName ); - log.finest("topic = " + topic ); + if (log.isLoggable(Level.FINEST)) log.finest("topic = " + topic ); MessageConsumer consumer = null; if (isDurableSubscription) { @@ -250,7 +252,7 @@ public class TopicListener implements MessageListener { consumer = session.createConsumer( topic ); } - log.finest("consumer = " + consumer ); + if (log.isLoggable(Level.FINEST)) log.finest("consumer = " + consumer ); consumer.setMessageListener( this ); @@ -264,7 +266,7 @@ public class TopicListener implements MessageListener { ; pLog.setReference( logReference.toString() ); boolean resultSave = pLog.save(); - log.finest("Result Save = " + resultSave); + if (log.isLoggable(Level.FINEST)) log.finest("Result Save = " + resultSave); } } @@ -279,7 +281,7 @@ public class TopicListener implements MessageListener { TextMessage txtMessage = (TextMessage) message; String text = txtMessage.getText(); - log.finest("Received message: \n" + text ); + if (log.isLoggable(Level.FINEST)) log.finest("Received message: \n" + text ); Document documentToBeImported = XMLHelper.createDocumentFromString( text ); StringBuffer result = new StringBuffer(); @@ -308,7 +310,7 @@ public class TopicListener implements MessageListener { } catch (Exception e) { - log.finest("Rollback = " + e.toString()); + if (log.isLoggable(Level.FINEST)) log.finest("Rollback = " + e.toString()); try { session.rollback(); diff --git a/org.adempiere.replication/src/org/adempiere/process/rpl/exp/ExportHelper.java b/org.adempiere.replication/src/org/adempiere/process/rpl/exp/ExportHelper.java index 2f6ba861e6..bc8155fe34 100644 --- a/org.adempiere.replication/src/org/adempiere/process/rpl/exp/ExportHelper.java +++ b/org.adempiere.replication/src/org/adempiere/process/rpl/exp/ExportHelper.java @@ -35,6 +35,7 @@ import java.text.SimpleDateFormat; import java.util.Collection; import java.util.HashMap; import java.util.Properties; +import java.util.logging.Level; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -200,8 +201,10 @@ public class ExportHelper { for (PO po : records) { log.info("Client = " + client.toString()); - log.finest("po.getAD_Org_ID() = " + po.getAD_Org_ID()); - log.finest("po.get_TrxName() = " + po.get_TrxName()); + if (log.isLoggable(Level.FINEST)){ + log.finest("po.getAD_Org_ID() = " + po.getAD_Org_ID()); + log.finest("po.get_TrxName() = " + po.get_TrxName()); + } if (po.get_TrxName() == null || po.get_TrxName().equals("")) { po.set_TrxName("exportRecord"); } diff --git a/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempierePLAF.java b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempierePLAF.java index 05abd0cfc5..43b03a89a3 100644 --- a/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempierePLAF.java +++ b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempierePLAF.java @@ -376,10 +376,10 @@ public final class AdempierePLAF if (lfInfo[i].getName().equals(org.adempiere.plaf.AdempiereLookAndFeel.NAME)) { s_defaultPLAF = vp; - log.finest(vp.getName() + " (default)"); + if (log.isLoggable(Level.FINEST)) log.finest(vp.getName() + " (default)"); } else - log.finest(vp.getName()); + if (log.isLoggable(Level.FINEST)) log.finest(vp.getName()); } s_looks = new ValueNamePair[plafList.size()]; plafList.toArray(s_looks); diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoGeneral.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoGeneral.java index 759c67d5e1..44b7a54bab 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoGeneral.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoGeneral.java @@ -281,7 +281,7 @@ public class InfoGeneral extends Info log.log(Level.SEVERE, "No query columns found"); return false; } - log.finest("Table " + tableName + ", ID=" + AD_Table_ID + if (log.isLoggable(Level.FINEST)) log.finest("Table " + tableName + ", ID=" + AD_Table_ID + ", QueryColumns #" + m_queryColumns.size()); // Only 4 Query Columns while (m_queryColumns.size() > 4) { @@ -368,10 +368,10 @@ public class InfoGeneral extends Info if (colClass != null) { list.add(new Info_Column(Msg.translate(Env.getCtx(), columnName), colSql.toString(), colClass)); - log.finest("Added Column=" + columnName); + if (log.isLoggable(Level.FINEST)) log.finest("Added Column=" + columnName); } else - log.finest("Not Added Column=" + columnName); + if (log.isLoggable(Level.FINEST)) log.finest("Not Added Column=" + columnName); } } catch (SQLException e) @@ -389,7 +389,7 @@ public class InfoGeneral extends Info log.log(Level.SEVERE, "No Info for AD_Table_ID=" + AD_Table_ID + " - " + sql); return false; } - log.finest("InfoColumns #" + list.size()); + if (log.isLoggable(Level.FINEST)) log.finest("InfoColumns #" + list.size()); // Convert ArrayList to Array m_generalLayout = new Info_Column[list.size()]; diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/GridController.java b/org.adempiere.ui.swing/src/org/compiere/grid/GridController.java index 335daad015..79f8cc50a4 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/GridController.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/GridController.java @@ -1390,7 +1390,7 @@ public class GridController extends CPanel public void mouseClicked(MouseEvent e) { if (CLogMgt.isLevelFinest()) - log.finest("" + this + " - " + e); + if (log.isLoggable(Level.FINEST)) log.finest("" + this + " - " + e); } /** * Mouse Pressed @@ -1398,8 +1398,7 @@ public class GridController extends CPanel */ public void mousePressed(MouseEvent e) { - if (CLogMgt.isLevelFinest()) - log.finest("" + this + " - " + e); + if (log.isLoggable(Level.FINEST)) log.finest("" + this + " - " + e); } /** * Mouse Released @@ -1407,8 +1406,7 @@ public class GridController extends CPanel */ public void mouseReleased(MouseEvent e) { - if (CLogMgt.isLevelFinest()) - log.finest("" + this + " - " + e); + if (log.isLoggable(Level.FINEST)) log.finest("" + this + " - " + e); } /** * Mouse Entered @@ -1416,8 +1414,7 @@ public class GridController extends CPanel */ public void mouseEntered(MouseEvent e) { - if (CLogMgt.isLevelFinest()) - log.finest("" + this + " - " + e); + if (log.isLoggable(Level.FINEST)) log.finest("" + this + " - " + e); } /** * Mouse Exited @@ -1425,8 +1422,7 @@ public class GridController extends CPanel */ public void mouseExited(MouseEvent e) { - if (CLogMgt.isLevelFinest()) - log.finest("" + this + " - " + e); + if (log.isLoggable(Level.FINEST)) log.finest("" + this + " - " + e); } /** diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VPanel.java b/org.adempiere.ui.swing/src/org/compiere/grid/VPanel.java index 183cf95d20..cb68d44d88 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/VPanel.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/VPanel.java @@ -22,6 +22,7 @@ import java.awt.Component; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.logging.Level; import javax.swing.BorderFactory; import javax.swing.Box; @@ -461,7 +462,7 @@ public final class VPanel extends CTabbedPane label.setText(text); label.setSavedMnemonic(predefinedMnemonic); m_fields.add(label); - log.finest(predefinedMnemonic + " - " + label.getName()); + if (log.isLoggable(Level.FINEST)) log.finest(predefinedMnemonic + " - " + label.getName()); } else { @@ -491,7 +492,7 @@ public final class VPanel extends CTabbedPane cb.setText(text); cb.setSavedMnemonic(predefinedMnemonic); m_fields.add(cb); - log.finest(predefinedMnemonic + " - " + cb.getName()); + if (log.isLoggable(Level.FINEST)) log.finest(predefinedMnemonic + " - " + cb.getName()); } else { @@ -513,7 +514,7 @@ public final class VPanel extends CTabbedPane b.setText(text); b.setSavedMnemonic(predefinedMnemonic); m_fields.add(b); - log.finest(predefinedMnemonic + " - " + b.getName()); + if (log.isLoggable(Level.FINEST)) log.finest(predefinedMnemonic + " - " + b.getName()); } else if (b.getColumnName().equals("DocAction")) { @@ -585,13 +586,13 @@ public final class VPanel extends CTabbedPane // Nothing found if (mnemonic == 0) { - log.finest("None for: " + oText); + if (log.isLoggable(Level.FINEST)) log.finest("None for: " + oText); return 0; // if first char would be returned, the first occurrence is invalid. } } m_mnemonics.add(mnemonic); m_fields.add(source); - log.finest(mnemonic + " - " + source.getName()); + if (log.isLoggable(Level.FINEST)) log.finest(mnemonic + " - " + source.getName()); return mnemonic; } // getMnemonic diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VTableExcelAdapter.java b/org.adempiere.ui.swing/src/org/compiere/grid/VTableExcelAdapter.java index ebcea7d350..e29795c220 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/VTableExcelAdapter.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/VTableExcelAdapter.java @@ -187,7 +187,7 @@ public class VTableExcelAdapter } value = fixString(value); sb.append(value).append("\t"); - if(CLogMgt.isLevelFinest()) log.finest("col=" + col + ", row=" + row + ": key=" + key + " => value=" + value + ", " + field + ", " + lookup); + if (log.isLoggable(Level.FINEST)) log.finest("col=" + col + ", row=" + row + ": key=" + key + " => value=" + value + ", " + field + ", " + lookup); } sb.append(Env.NL); } diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/CityAutoCompleter.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/CityAutoCompleter.java index 7d0930f7dc..d26ef437f5 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/CityAutoCompleter.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/CityAutoCompleter.java @@ -19,6 +19,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; +import java.util.logging.Level; import javax.swing.text.JTextComponent; @@ -173,7 +174,7 @@ public class CityAutoCompleter extends AutoCompleter private void setCity(CityVO vo) { m_city = vo; - log.finest("C_City_ID="+m_city); + if (log.isLoggable(Level.FINEST)) log.finest("C_City_ID="+m_city); if (m_city == null) { textBox.setBackground(new Color(230, 230, 255)); } else { diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocDate.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocDate.java index 0b1d3f3d5a..eeafd6d627 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocDate.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocDate.java @@ -103,7 +103,7 @@ public final class MDocDate extends PlainDocument implements CaretListener public void insertString (int offset, String string, AttributeSet attr) throws BadLocationException { - log.finest("Offset=" + offset + ",String=" + string + ",Attr=" + attr + if (log.isLoggable(Level.FINEST)) log.finest("Offset=" + offset + ",String=" + string + ",Attr=" + attr + ",OldText=" + getText() + ",OldLength=" + getText().length()); // manual entry @@ -181,7 +181,7 @@ public final class MDocDate extends PlainDocument implements CaretListener public void remove (int offset, int length) throws BadLocationException { - log.finest("Offset=" + offset + ",Length=" + length); + if (log.isLoggable(Level.FINEST)) log.finest("Offset=" + offset + ",Length=" + length); // begin of string if (offset == 0 || length == 0) @@ -212,7 +212,7 @@ public final class MDocDate extends PlainDocument implements CaretListener */ public void caretUpdate(CaretEvent e) { - log.finest("Dot=" + e.getDot() + ",Last=" + m_lastDot + if (log.isLoggable(Level.FINEST)) log.finest("Dot=" + e.getDot() + ",Last=" + m_lastDot + ", Mark=" + e.getMark()); // Selection if (e.getDot() != e.getMark()) diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocNumber.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocNumber.java index 02fa20e9f2..44e930a3ba 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocNumber.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocNumber.java @@ -20,6 +20,7 @@ import java.math.BigDecimal; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.text.ParseException; +import java.util.logging.Level; import javax.swing.text.AttributeSet; import javax.swing.text.BadLocationException; @@ -105,7 +106,7 @@ public final class MDocNumber extends PlainDocument public void insertString(int origOffset, String string, AttributeSet attr) throws BadLocationException { - log.finest("Offset=" + origOffset + " String=" + string + " Length=" + string.length()); + if (log.isLoggable(Level.FINEST)) log.finest("Offset=" + origOffset + " String=" + string + " Length=" + string.length()); if (origOffset < 0 || string == null) throw new IllegalArgumentException("Invalid argument"); @@ -264,7 +265,7 @@ public final class MDocNumber extends PlainDocument public void remove (int origOffset, int length) throws BadLocationException { - log.finest("Offset=" + origOffset + " Length=" + length); + if (log.isLoggable(Level.FINEST)) log.finest("Offset=" + origOffset + " Length=" + length); if (origOffset < 0 || length < 0) throw new IllegalArgumentException("MDocNumber.remove - invalid argument"); diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocString.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocString.java index 0c9ca23878..84ad270253 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocString.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocString.java @@ -16,6 +16,8 @@ *****************************************************************************/ package org.compiere.grid.ed; +import java.util.logging.Level; + import javax.swing.event.CaretEvent; import javax.swing.event.CaretListener; import javax.swing.text.AttributeSet; @@ -156,13 +158,13 @@ public final class MDocString extends PlainDocument implements CaretListener // We have no Format or inserted not manually (assuming correct Format) if (m_VFormat.length() == 0 || string.length() != 1) { - log.finest("Offset=" + offset + " String=" + string); + if (log.isLoggable(Level.FINEST)) log.finest("Offset=" + offset + " String=" + string); super.insertString(offset, string, attr); return; } /** Formating required **/ - log.finest("Offset=" + offset + if (log.isLoggable(Level.FINEST)) log.finest("Offset=" + offset + ", String=" + string + ", MaxLength=" + m_maxLength + ", Format=" + m_VFormat + ", Mask=" + m_mask + ", Text=" + getText() + ", Length=" + getText().length()); @@ -304,7 +306,7 @@ public final class MDocString extends PlainDocument implements CaretListener // No format or non manual entry if (m_VFormat.length() == 0 || length != 1) { - log.finest("Offset=" + offset + " Length=" + length); + if (log.isLoggable(Level.FINEST)) log.finest("Offset=" + offset + " Length=" + length); super.remove(offset, length); return; } diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VCellEditor.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VCellEditor.java index 3b76556732..482262620e 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VCellEditor.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VCellEditor.java @@ -23,6 +23,7 @@ import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; import java.beans.VetoableChangeListener; import java.util.EventObject; +import java.util.logging.Level; import javax.swing.AbstractCellEditor; import javax.swing.BorderFactory; @@ -134,7 +135,7 @@ public final class VCellEditor extends AbstractCellEditor */ public Component getTableCellEditorComponent (JTable table, Object value, boolean isSelected, int row, int col) { - log.finest(m_mField.getColumnName() + ": Value=" + value + ", row=" + row + ", col=" + col); + if (log.isLoggable(Level.FINEST)) log.finest(m_mField.getColumnName() + ": Value=" + value + ", row=" + row + ", col=" + col); if (row >= 0) table.setRowSelectionInterval(row,row); // force moving to new row if (m_editor == null ) @@ -179,7 +180,7 @@ public final class VCellEditor extends AbstractCellEditor */ public boolean shouldSelectCell(EventObject e) { - log.finest(m_mField.getColumnName()); + if (log.isLoggable(Level.FINEST)) log.finest(m_mField.getColumnName()); return true; } // shouldSelectCell @@ -189,7 +190,7 @@ public final class VCellEditor extends AbstractCellEditor */ public Object getCellEditorValue() { - log.finest(m_mField.getColumnName() + ": " + m_editor.getValue()); + if (log.isLoggable(Level.FINEST)) log.finest(m_mField.getColumnName() + ": " + m_editor.getValue()); return m_editor.getValue(); } // getCellEditorValue diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VDate.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VDate.java index 994dfc7a9e..fc43480770 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VDate.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VDate.java @@ -329,7 +329,7 @@ public class VDate extends JComponent */ public void setValue (Object value) { - log.finest("Value=" + value); + if (log.isLoggable(Level.FINEST)) log.finest("Value=" + value); m_oldText = ""; if (value == null) ; @@ -471,7 +471,7 @@ public class VDate extends JComponent */ public void keyReleased(KeyEvent e) { - log.finest("Key=" + e.getKeyCode() + " - " + e.getKeyChar() + if (log.isLoggable(Level.FINEST)) log.finest("Key=" + e.getKeyCode() + " - " + e.getKeyChar() + " -> " + m_text.getText()); // ESC if (e.getKeyCode() == KeyEvent.VK_ESCAPE) diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VFile.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VFile.java index 9da3777993..4d69b8a984 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VFile.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VFile.java @@ -30,6 +30,7 @@ import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyVetoException; import java.io.File; +import java.util.logging.Level; import javax.swing.JComponent; import javax.swing.JFileChooser; @@ -39,7 +40,6 @@ import org.adempiere.plaf.AdempierePLAF; import org.compiere.model.GridField; import org.compiere.swing.CButton; import org.compiere.swing.CTextField; -import org.compiere.util.CLogMgt; import org.compiere.util.CLogger; import org.compiere.util.Env; import org.compiere.util.Msg; @@ -390,8 +390,7 @@ public class VFile extends JComponent * @see java.awt.event.KeyListener#keyReleased(java.awt.event.KeyEvent) */ public void keyReleased(KeyEvent e) { - if (CLogMgt.isLevelFinest()) - log.finest("Key=" + e.getKeyCode() + " - " + e.getKeyChar() + " -> " + m_text.getText()); + if (log.isLoggable(Level.FINEST)) log.finest("Key=" + e.getKeyCode() + " - " + e.getKeyChar() + " -> " + m_text.getText()); // ESC if (e.getKeyCode() == KeyEvent.VK_ESCAPE) m_text.setText(m_initialText); diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java index c96347ef90..a69f6a6589 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java @@ -639,7 +639,7 @@ public class VLookup extends JComponent // lookup found nothing too if (notFound) { - log.finest(m_columnName + "=" + value + ": Not found - " + m_lastDisplay); + if (log.isLoggable(Level.FINEST)) log.finest(m_columnName + "=" + value + ": Not found - " + m_lastDisplay); // we may have a new value m_lookup.refresh(); m_combo.setValue (value); @@ -1019,7 +1019,7 @@ public class VLookup extends JComponent sql.append(" AND ").append(wc); sql.append(" AND IsActive='Y'"); // *** - log.finest(m_columnName + " (predefined) " + sql.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(m_columnName + " (predefined) " + sql.toString()); return MRole.getDefault().addAccessSQL(sql.toString(), m_tableName, MRole.SQL_NOTQUALIFIED, MRole.SQL_RO); } @@ -1199,7 +1199,7 @@ public class VLookup extends JComponent sql.append(" AND ").append(wc); sql.append(" AND IsActive='Y'"); // *** - log.finest(m_columnName + " (predefined) " + sql.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(m_columnName + " (predefined) " + sql.toString()); return MRole.getDefault().addAccessSQL(sql.toString(), m_tableName, MRole.SQL_NOTQUALIFIED, MRole.SQL_RO); } @@ -1252,7 +1252,7 @@ public class VLookup extends JComponent if (wc != null && wc.length() > 0) sql.append(" AND ").append(wc); // *** - log.finest(m_columnName + " (Table) " + sql.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(m_columnName + " (Table) " + sql.toString()); return MRole.getDefault().addAccessSQL(sql.toString(), m_tableName, MRole.SQL_NOTQUALIFIED, MRole.SQL_RO); } @@ -1307,7 +1307,7 @@ public class VLookup extends JComponent if (wc != null && wc.length() > 0) retValue.append(" AND ").append(wc); // *** - log.finest(m_columnName + " (TableDir) " + sql.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(m_columnName + " (TableDir) " + sql.toString()); return MRole.getDefault().addAccessSQL(retValue.toString(), m_tableName, MRole.SQL_NOTQUALIFIED, MRole.SQL_RO); } // getDirectAccessSQL diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VNumber.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VNumber.java index e78957cbc6..0cbf2298bd 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VNumber.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VNumber.java @@ -378,7 +378,7 @@ public final class VNumber extends JComponent */ public void setValue(Object value) { - log.finest("Value=" + value); + if (log.isLoggable(Level.FINEST)) log.finest("Value=" + value); if (value == null) m_oldText = ""; else @@ -589,7 +589,7 @@ public final class VNumber extends JComponent */ public void keyReleased(KeyEvent e) { - log.finest("Key=" + e.getKeyCode() + " - " + e.getKeyChar() + if (log.isLoggable(Level.FINEST)) log.finest("Key=" + e.getKeyCode() + " - " + e.getKeyChar() + " -> " + m_text.getText()); // ESC diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttribute.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttribute.java index 294e32fc65..58c8bd5aa4 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttribute.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttribute.java @@ -447,7 +447,7 @@ public class VPAttribute extends JComponent // Set Value if (changed) { - log.finest("Changed M_AttributeSetInstance_ID=" + M_AttributeSetInstance_ID); + if (log.isLoggable(Level.FINEST)) log.finest("Changed M_AttributeSetInstance_ID=" + M_AttributeSetInstance_ID); m_value = new Object(); // force re-query display if (M_AttributeSetInstance_ID == 0) setValue(null); @@ -456,7 +456,7 @@ public class VPAttribute extends JComponent // Change Locator if (m_GridTab != null && M_Locator_ID > 0) { - log.finest("Change M_Locator_ID="+M_Locator_ID); + if (log.isLoggable(Level.FINEST)) log.finest("Change M_Locator_ID="+M_Locator_ID); m_GridTab.setValue("M_Locator_ID", M_Locator_ID); } // diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPaymentEditor.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPaymentEditor.java index 25713c1e9d..a1c2a06cbe 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPaymentEditor.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPaymentEditor.java @@ -273,7 +273,7 @@ public class VPaymentEditor extends JComponent implements VEditor, ActionListene // lookup found nothing too if (notFound) { - log.finest(m_columnName + "=" + value + ": Not found - " + m_lastDisplay); + if (log.isLoggable(Level.FINEST)) log.finest(m_columnName + "=" + value + ": Not found - " + m_lastDisplay); // we may have a new value m_lookup.refresh(); m_combo.setValue (value); diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VString.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VString.java index 7a9913635c..43543f05a0 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VString.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VString.java @@ -28,6 +28,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyVetoException; +import java.util.logging.Level; import javax.swing.JPopupMenu; import javax.swing.SwingUtilities; @@ -248,7 +249,7 @@ public final class VString extends CTextField */ public void keyReleased(KeyEvent e) { - log.finest("Key=" + e.getKeyCode() + " - " + e.getKeyChar() + if (log.isLoggable(Level.FINEST)) log.finest("Key=" + e.getKeyCode() + " - " + e.getKeyChar() + " -> " + getText()); // ESC if (e.getKeyCode() == KeyEvent.VK_ESCAPE) diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VTextLong.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VTextLong.java index 459c7909f4..c9d8455de3 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VTextLong.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VTextLong.java @@ -29,6 +29,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyVetoException; +import java.util.logging.Level; import javax.swing.JFrame; import javax.swing.JPopupMenu; @@ -197,7 +198,7 @@ public class VTextLong extends CTextPane */ public void actionPerformed(ActionEvent e) { - log.finest( "VTestLong.actionPerformed - " + e.getActionCommand()); + if (log.isLoggable(Level.FINEST)) log.finest( "VTestLong.actionPerformed - " + e.getActionCommand()); if (e.getSource() == menuEditor) { menuEditor.setEnabled(false); diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VURL.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VURL.java index 4e382ed40b..0cfd068661 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VURL.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VURL.java @@ -32,6 +32,7 @@ import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyVetoException; import java.net.URL; +import java.util.logging.Level; import javax.swing.JComponent; import javax.swing.JPopupMenu; @@ -334,7 +335,7 @@ public class VURL extends JComponent */ public void keyReleased(KeyEvent e) { - log.finest("Key=" + e.getKeyCode() + " - " + e.getKeyChar() + if (log.isLoggable(Level.FINEST)) log.finest("Key=" + e.getKeyCode() + " - " + e.getKeyChar() + " -> " + getText()); // ESC if (e.getKeyCode() == KeyEvent.VK_ESCAPE) 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 90a31b03d6..e16beedfec 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 @@ -266,7 +266,7 @@ public class WPAttributeEditor extends WEditor implements ContextMenuListener } // cmd_file private void processChanges(int oldValueInt, int M_AttributeSetInstance_ID) { - log.finest("Changed M_AttributeSetInstance_ID=" + M_AttributeSetInstance_ID); + if (log.isLoggable(Level.FINEST)) log.finest("Changed M_AttributeSetInstance_ID=" + M_AttributeSetInstance_ID); m_value = new Object(); // force re-query display if (M_AttributeSetInstance_ID == 0) setValue(null); 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 df15206b7c..9533dc5eb7 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 @@ -649,8 +649,7 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value sql.append(" AND IsActive='Y'"); // *** - if (log.isLoggable(Level.FINEST)) - log.finest(m_columnName + " (predefined) " + sql.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(m_columnName + " (predefined) " + sql.toString()); return MRole.getDefault().addAccessSQL(sql.toString(), m_tableName, MRole.SQL_NOTQUALIFIED, MRole.SQL_RO); @@ -723,8 +722,7 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value // *** - if (log.isLoggable(Level.FINEST)) - log.finest(m_columnName + " (Table) " + sql.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(m_columnName + " (Table) " + sql.toString()); return MRole.getDefault().addAccessSQL(sql.toString(), m_tableName, MRole.SQL_NOTQUALIFIED, MRole.SQL_RO); @@ -788,8 +786,7 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value if (wc != null && wc.length() > 0) retValue.append(" AND ").append(wc); // *** - if (log.isLoggable(Level.FINEST)) - log.finest(m_columnName + " (TableDir) " + sql.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(m_columnName + " (TableDir) " + sql.toString()); return MRole.getDefault().addAccessSQL(retValue.toString(), m_tableName, MRole.SQL_NOTQUALIFIED, MRole.SQL_RO); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java index 6b98a783e3..77ff9b36ac 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java @@ -519,8 +519,7 @@ public class InfoProductWindow extends InfoWindow { { //int M_Product_ID = 0; String sql = m_sqlWarehouse; - if (log.isLoggable(Level.FINEST)) - log.finest(sql); + if (log.isLoggable(Level.FINEST)) log.finest(sql); PreparedStatement pstmt = null; ResultSet rs = null; try @@ -545,8 +544,7 @@ public class InfoProductWindow extends InfoWindow { fieldDescription.setText(DB.getSQLValueString(null, sql, m_M_Product_ID)); sql = m_sqlSubstitute; - if (log.isLoggable(Level.FINEST)) - log.finest(sql); + if (log.isLoggable(Level.FINEST)) log.finest(sql); try { pstmt = DB.prepareStatement(sql, null); pstmt.setInt(1, m_M_Product_ID); @@ -563,8 +561,7 @@ public class InfoProductWindow extends InfoWindow { } sql = m_sqlRelated; - if (log.isLoggable(Level.FINEST)) - log.finest(sql); + if (log.isLoggable(Level.FINEST)) log.finest(sql); try { pstmt = DB.prepareStatement(sql, null); pstmt.setInt(1, m_M_Product_ID); @@ -583,8 +580,7 @@ public class InfoProductWindow extends InfoWindow { //IDEMPIERE-337 sql = m_sqlProductprice; - if (log.isLoggable(Level.FINEST)) - log.finest(sql); + if (log.isLoggable(Level.FINEST)) log.finest(sql); try { pstmt = DB.prepareStatement(sql, null); pstmt.setInt(1, m_M_Product_ID); 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 32c70f7da5..af4962ced9 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 @@ -313,7 +313,7 @@ public class InfoGeneralPanel extends InfoPanel implements EventListener return false; } - log.finest("Table " + tableName + ", ID=" + AD_Table_ID + if (log.isLoggable(Level.FINEST)) log.finest("Table " + tableName + ", ID=" + AD_Table_ID + ", QueryColumns #" + m_queryColumns.size()); // Only 4 Query Columns @@ -400,10 +400,10 @@ public class InfoGeneralPanel extends InfoPanel implements EventListener if (colClass != null) { list.add(new ColumnInfo(Msg.translate(Env.getCtx(), columnName), colSql.toString(), colClass)); - log.finest("Added Column=" + columnName); + if (log.isLoggable(Level.FINEST)) log.finest("Added Column=" + columnName); } else - log.finest("Not Added Column=" + columnName); + if (log.isLoggable(Level.FINEST)) log.finest("Not Added Column=" + columnName); } } catch (SQLException e) @@ -425,7 +425,7 @@ public class InfoGeneralPanel extends InfoPanel implements EventListener return false; } - log.finest("InfoColumns #" + list.size()); + if (log.isLoggable(Level.FINEST)) log.finest("InfoColumns #" + list.size()); // Convert ArrayList to Array m_generalLayout = new ColumnInfo[list.size()]; diff --git a/org.adempiere.ui/src/org/compiere/apps/AbstractProcessCtl.java b/org.adempiere.ui/src/org/compiere/apps/AbstractProcessCtl.java index cafc55e69b..8e48de83fc 100644 --- a/org.adempiere.ui/src/org/compiere/apps/AbstractProcessCtl.java +++ b/org.adempiere.ui/src/org/compiere/apps/AbstractProcessCtl.java @@ -355,7 +355,7 @@ public abstract class AbstractProcessCtl implements Runnable if (server != null) { // See ServerBean m_pi = server.workflow (Env.getRemoteCallCtx(Env.getCtx()), m_pi, AD_Workflow_ID); - log.finest("server => " + m_pi); + if (log.isLoggable(Level.FINEST)) log.finest("server => " + m_pi); started = true; } } @@ -409,7 +409,7 @@ public abstract class AbstractProcessCtl implements Runnable { // See ServerBean m_pi = server.process (Env.getRemoteCallCtx(Env.getCtx()), m_pi); - log.finest("server => " + m_pi); + if (log.isLoggable(Level.FINEST)) log.finest("server => " + m_pi); started = true; } } @@ -470,7 +470,7 @@ public abstract class AbstractProcessCtl implements Runnable if (server != null) { // See ServerBean m_pi = server.dbProcess(Env.getRemoteCallCtx(Env.getCtx()), m_pi, ProcedureName); - log.finest("server => " + m_pi); + if (log.isLoggable(Level.FINEST)) log.finest("server => " + m_pi); started = true; } } diff --git a/org.adempiere.ui/src/org/compiere/apps/form/Archive.java b/org.adempiere.ui/src/org/compiere/apps/form/Archive.java index e9443081b0..8823d98027 100644 --- a/org.adempiere.ui/src/org/compiere/apps/form/Archive.java +++ b/org.adempiere.ui/src/org/compiere/apps/form/Archive.java @@ -14,6 +14,7 @@ package org.compiere.apps.form; import java.sql.Timestamp; +import java.util.logging.Level; import org.compiere.model.MArchive; import org.compiere.model.MBPartner; @@ -210,7 +211,7 @@ public class Archive { + "WHERE wa.AD_Role_ID=").append(role.getAD_Role_ID()) .append(" OR ").append(role.getIncludedRolesWhereClause("wa.AD_Role_ID", null)) .append("))"); - log.finest(sql.toString()); + if (log.isLoggable(Level.FINEST)) log.finest(sql.toString()); //metas: Bugfix zu included_Role ende // m_archives = MArchive.get(Env.getCtx(), sql.toString()); diff --git a/org.adempiere.ui/src/org/compiere/apps/form/PaySelect.java b/org.adempiere.ui/src/org/compiere/apps/form/PaySelect.java index 12da75922a..50f5805887 100644 --- a/org.adempiere.ui/src/org/compiere/apps/form/PaySelect.java +++ b/org.adempiere.ui/src/org/compiere/apps/form/PaySelect.java @@ -334,7 +334,7 @@ public class PaySelect sql += " AND i.c_doctype_id =?"; sql += " ORDER BY 2,3"; - log.finest(sql + " - C_Currency_ID=" + bi.C_Currency_ID + ", C_BPartner_ID=" + C_BPartner_ID + ", C_doctype_id=" + c_doctype_id ); + if (log.isLoggable(Level.FINEST)) log.finest(sql + " - C_Currency_ID=" + bi.C_Currency_ID + ", C_BPartner_ID=" + C_BPartner_ID + ", C_doctype_id=" + c_doctype_id ); // Get Open Invoices PreparedStatement pstmt = null; ResultSet rs = null; diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/LoginLinkTag.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/LoginLinkTag.java index ead39df997..51c9a67399 100644 --- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/LoginLinkTag.java +++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/LoginLinkTag.java @@ -17,6 +17,7 @@ package org.compiere.wstore; import java.util.Properties; +import java.util.logging.Level; import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspException; @@ -115,13 +116,13 @@ public class LoginLinkTag extends TagSupport WebUser wu = (WebUser)pageContext.getSession().getAttribute (WebUser.NAME); if (wu != null) { - log.finest("(" + address + ") - SessionContext: " + wu); + if (log.isLoggable(Level.FINEST)) log.finest("(" + address + ") - SessionContext: " + wu); } else { wu = (WebUser)pageContext.getAttribute(WebUser.NAME); if (wu != null) - log.finest ("(" + address + ") - Context: " + wu); + if (log.isLoggable(Level.FINEST)) log.finest ("(" + address + ") - Context: " + wu); } if (wu != null) return wu; diff --git a/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/config/ConfigOracle.java b/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/config/ConfigOracle.java index 9c0de9b449..cd81534a81 100644 --- a/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/config/ConfigOracle.java +++ b/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/config/ConfigOracle.java @@ -24,6 +24,7 @@ import java.net.InetAddress; import java.sql.Connection; import java.sql.DriverManager; import java.util.ArrayList; +import java.util.logging.Level; import java.util.regex.Pattern; import org.adempiere.install.DBConfigStatus; @@ -251,7 +252,7 @@ public class ConfigOracle implements IDatabaseConfig for (int i = 0; i < lines.length; i++) { String line = lines[i].trim(); - log.finest(i + ": " + line); + if (log.isLoggable(Level.FINEST)) log.finest(i + ": " + line); if (tns) // get TNS Name { if (line.length() > 0 diff --git a/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportInfo.java b/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportInfo.java index 5f66a7dda6..49b6511552 100644 --- a/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportInfo.java +++ b/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportInfo.java @@ -30,6 +30,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; +import java.util.logging.Level; import net.sf.jasperreports.engine.JRException; import net.sf.jasperreports.engine.JasperCompileManager; @@ -80,7 +81,7 @@ public class ReportInfo protected File processReport(String reportFile) { - log.finest("ReportInfo.processReport - " + reportFile); + if (log.isLoggable(Level.FINEST)) log.finest("ReportInfo.processReport - " + reportFile); File JasperDesignFile = new File(reportFile); String JasperReportFile = reportFile.replaceAll(".jrxml", ".jasper").replaceAll(".xml", ".jasper"); File jasperFile = new File(JasperReportFile); @@ -126,7 +127,7 @@ public class ReportInfo File[] subreports = JasperDesignFile.getParentFile().listFiles( new FileFilter( JasperReportFile.replaceAll(".jasper","")+"Subreport", JasperDesignFile.getParentFile(), extension)); for( int i=0; i