User: kz Date: 2008-05-05 14:49:28+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/output/text/VariablesDeclarations.java
Log: INTEGRATION: CWS dba30beta (1.3.6); FILE MERGED 2008/04/22 10:30:29 oj 1.3.6.1: #i88503# merge changes from rptchart02 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/output/text/ ========================================================================== File [changed]: VariablesDeclarations.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/output/text/VariablesDeclarations.java?r1=1.3&r2=1.4 Delta lines: +46 -47 --------------------- --- VariablesDeclarations.java 2008-04-10 17:41:40+0000 1.3 +++ VariablesDeclarations.java 2008-05-05 14:49:25+0000 1.4 @@ -27,8 +27,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - - package com.sun.star.report.pentaho.output.text; import java.util.HashMap; @@ -47,8 +45,9 @@ */ public class VariablesDeclarations { - private AttributeNameGenerator nameGenerator; - private HashMap variables; + + private final AttributeNameGenerator nameGenerator; + private final Map variables; public VariablesDeclarations() { @@ -75,13 +74,13 @@ if (holder.isEmpty()) { // create the default mapping as well.. - holder.put (null, name); + holder.put(null, name); } - holder.put (type, name); + holder.put(type, name); return result; } - public Map getDefinedMappings () + public Map getDefinedMappings() { final HashMap mappings = new HashMap(); final Iterator vars = variables.values().iterator(); @@ -92,11 +91,11 @@ while (varsByType.hasNext()) { final Map.Entry entry = (Map.Entry) varsByType.next(); - final String varName = (String) entry.getValue(); final String type = (String) entry.getKey(); if (type != null) { - mappings.put (varName, type); + final String varName = (String) entry.getValue(); + mappings.put(varName, type); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
