Author: tchemit Date: 2014-04-26 19:10:22 +0200 (Sat, 26 Apr 2014) New Revision: 1341 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1341 Log: fixes #3176: Review the outputProperties state in Transformer Modified: trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java 2014-04-25 10:06:34 UTC (rev 1340) +++ trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java 2014-04-26 17:10:22 UTC (rev 1341) @@ -68,7 +68,7 @@ /** * Properties for output generator. */ - protected Properties outputProperties; + protected Properties outputProperties = new Properties(); public Transformer() { } @@ -96,14 +96,15 @@ // merge input configuration + output properties Properties properties = new Properties(); properties.putAll(getConfiguration().getProperties()); - properties.putAll(getOutputProperties()); + properties.putAll(outputProperties); TemplateConfiguration outconfig = new DefaultTemplateConfiguration(properties); + // Note tchemit 2014-04-26, do not touch the outputProperties, init the transformer + // should not change this state // push back to outputPropertie the all configuration - //FIXME tchemit 2010-05-16 Should rethink this... - outputProperties = properties; +// outputProperties = properties; outputTemplate.setConfiguration(outconfig); outputModel = initOutputModel(); @@ -139,14 +140,20 @@ * * @return output properties * @since 2.0.0 + * @deprecated since 2.9, wille be removed in version 3.0, prefer use now {@link #addOutputProperty(String, Object)} */ + @Deprecated protected Properties getOutputProperties() { - if (outputProperties == null) { - outputProperties = new Properties(); - } +// if (outputProperties == null) { +// outputProperties = new Properties(); +// } return outputProperties; } + public void addOutputProperty(String key, Object value) { + outputProperties.put(key, value); + } + public Template<O> getOutputTemplate() { return outputTemplate; } @@ -156,8 +163,7 @@ } public String getDefaultPackageName() { - String packageName = - getOutputProperties().getProperty(PROP_DEFAULT_PACKAGE); + String packageName = getConfiguration().getProperty(PROP_DEFAULT_PACKAGE); return packageName; }