Author: fdesbois Date: 2010-05-08 13:12:02 +0200 (Sat, 08 May 2010) New Revision: 886 Url: http://nuiton.org/repositories/revision/eugene/886 Log: Correction of read method signature : "File[] files" becomes "File... files" Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java 2010-05-08 08:14:32 UTC (rev 885) +++ trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java 2010-05-08 11:12:02 UTC (rev 886) @@ -36,12 +36,10 @@ * * Created: 26 oct. 2009 * + * @author fdesbois <fdesbois@codelutin.com> + * @version $Id$ * @param <M> Model to create from reading input files - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : */ + */ public abstract class ModelReader<M extends Model> { private static final Log log = LogFactory.getLog(ModelReader.class); @@ -49,7 +47,7 @@ /** date de derniere modification de la source la plus recente */ protected long lastModifiedSource = 0; - protected void setLastModifiedSource(File[] files) { + protected void setLastModifiedSource(File... files) { for (File file : files) { if (file.lastModified() > getLastModifiedSource()) { lastModifiedSource = file.lastModified(); @@ -67,10 +65,10 @@ //TODO-TC : il vaut mieux directement un type dit variable // example : public abstract M read(File... file) {} - public M read(File file) { - return read(new File[] { file }); - } +// public M read(File file) { +// return read(new File[] { file }); +// } - public abstract M read(File[] file); + public abstract M read(File... file); } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-05-08 08:14:32 UTC (rev 885) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-05-08 11:12:02 UTC (rev 886) @@ -58,11 +58,8 @@ * * Created: 26 oct. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : * + * @author fdesbois <fdesbois@codelutin.com> + * @version $Id$ * @plexus.component role="org.nuiton.eugene.ModelReader" role-hint="objectmodel" */ public class ObjectModelReader extends ModelReader<ObjectModel> { @@ -90,7 +87,7 @@ * stereotype ou des tag value sur les class, attribute ou operation */ @Override - public ObjectModel read(File[] files) { + public ObjectModel read(File... files) { setLastModifiedSource(files); ObjectModel objectModel = new ObjectModelImpl(); Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java 2010-05-08 08:14:32 UTC (rev 885) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java 2010-05-08 11:12:02 UTC (rev 886) @@ -44,11 +44,8 @@ * * Created: 26 oct. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : * + * @author fdesbois <fdesbois@codelutin.com> + * @version $Id$ * @plexus.component role="org.nuiton.eugene.ModelReader" role-hint="statemodel" */ public class StateModelReader extends ModelReader<StateModel> { @@ -56,7 +53,7 @@ private static final Log log = LogFactory.getLog(StateModelReader.class); @Override - public StateModel read(File[] files) { + public StateModel read(File... files) { Digester digester = new Digester(); digester.addRuleSet(new DigesterStateModelRuleSet());
participants (1)
-
fdesbois@users.nuiton.org