Author: tchemit Date: 2008-01-24 21:28:39 +0000 (Thu, 24 Jan 2008) New Revision: 514 Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/BaseEntityFactory.java trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/LoggableElementFactory.java trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/MetaDataEntityFactory.java Log: changement prototype de la m?\195?\169thode getFactory ajout d'une surcharge dans MetaDataEntityFactory pour ne pas casser les casts Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/BaseEntityFactory.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/BaseEntityFactory.java 2008-01-24 20:40:32 UTC (rev 513) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/BaseEntityFactory.java 2008-01-24 21:28:39 UTC (rev 514) @@ -55,24 +55,22 @@ /** * Retrieve instance of the factory * - * @param <T> - * Factory spec. class * @param entityClass * Class wanted * @return Factory * @throws Exception */ @SuppressWarnings("unchecked") - public static <T extends DataEntity> BaseEntityFactory<T> getFactory( + public static <E extends DataEntity> BaseEntityFactory<E> getFactory( Class entityClass) throws Exception { - BaseEntityFactory<T> result = (BaseEntityFactory<T>) factories + BaseEntityFactory<E> result = (BaseEntityFactory<E>) factories .get(entityClass.getSimpleName()); if (result == null) { String elementFactoryClassName = BaseEntityFactory.class .getPackage().getName() + "." + entityClass.getSimpleName() + "Factory"; - Class<? extends BaseEntityFactory<T>> factoryClass = (Class<? extends BaseEntityFactory<T>>) Class + Class<? extends BaseEntityFactory<E>> factoryClass = (Class<? extends BaseEntityFactory<E>>) Class .forName(elementFactoryClassName).asSubclass( BaseEntityFactory.class); @@ -166,6 +164,7 @@ /** * Save an element to a XML stream * + * @param rootNodeName * @param element * @return * @throws Exception @@ -271,7 +270,7 @@ /** * Save an element as a XML stream * - * @param rootNode + * @param node * @return * @throws Exception */ @@ -290,7 +289,8 @@ Transformer transformer = tf.newTransformer(); transformer.transform(domSource, result); - ByteArrayInputStream inputStream = new ByteArrayInputStream(os + ByteArrayInputStream inputStream; + inputStream = new ByteArrayInputStream(os .toByteArray()); return inputStream; Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/LoggableElementFactory.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/LoggableElementFactory.java 2008-01-24 20:40:32 UTC (rev 513) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/LoggableElementFactory.java 2008-01-24 21:28:39 UTC (rev 514) @@ -29,8 +29,7 @@ public E loadElement(Element xmlElement) throws Exception { E element = super.loadElement(xmlElement); - MetaDataEntityFactory elementFactory = (MetaDataEntityFactory) BaseEntityFactory - .getFactory(MetaDataEntity.class); + MetaDataEntityFactory elementFactory = MetaDataEntityFactory.getFactory(MetaDataEntity.class); // Load metadata informations Element mdeElement = getXMLElementByTagName(xmlElement, KEY_METADATA); @@ -43,8 +42,7 @@ @Override public void saveElement(org.w3c.dom.Document document, Element xmlElement, E element) throws Exception { - MetaDataEntityFactory elementFactory = (MetaDataEntityFactory) BaseEntityFactory - .getFactory(MetaDataEntity.class); + MetaDataEntityFactory elementFactory = MetaDataEntityFactory.getFactory(MetaDataEntity.class); // Save metadata informations Element mdeElement = document.createElement(KEY_METADATA); Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/MetaDataEntityFactory.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/MetaDataEntityFactory.java 2008-01-24 20:40:32 UTC (rev 513) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/MetaDataEntityFactory.java 2008-01-24 21:28:39 UTC (rev 514) @@ -39,14 +39,20 @@ @Override public MetaDataEntity createInstance() { - return new MetaDataEntity(); + return new MetaDataEntity(); } + @SuppressWarnings({"unchecked"}) + public static <E extends MetaDataEntity> MetaDataEntityFactory<E> getFactory( + Class<E> entityClass) throws Exception { + return (MetaDataEntityFactory) BaseEntityFactory.getFactory(entityClass); + } /* * (non-Javadoc) * * @see fr.cemagref.simexplorer.is.storage.factories.BaseEntityFactory#loadXMLElement(org.w3c.dom.Element) */ + @Override public MetaDataEntity loadElement(Element xmlElement) throws Exception { MetaDataEntity entity = super.loadElement(xmlElement); @@ -215,7 +221,8 @@ Document document = getXMLBuilder().parse(xmlStream); Element rootElement = (Element) document.getFirstChild(); Element mdeElement = getXMLElementByTagName(rootElement, KEY_METADATA); - MetaDataEntity mde = loadElement(mdeElement); + MetaDataEntity mde; + mde = loadElement(mdeElement); return mde; }