Author: tchemit Date: 2010-08-21 18:02:52 +0200 (Sat, 21 Aug 2010) New Revision: 2104 Url: http://nuiton.org/repositories/revision/topia/2104 Log: - do english i18n - change <code>true|false</code> by {@code XXX} in javadoc - add some suppressWarning - clean code Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityEnum.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java trunk/topia-persistence/src/main/resources/i18n/topia-persistence-en_GB.properties trunk/topia-persistence/src/main/resources/i18n/topia-persistence-fr_FR.properties Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2010-08-21 16:01:23 UTC (rev 2103) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2010-08-21 16:02:52 UTC (rev 2104) @@ -663,13 +663,14 @@ /* -------------------- CHILD CONTEXT AND DAOS --------------------------*/ + @SuppressWarnings({"unchecked"}) @Override public <E extends TopiaEntity> TopiaDAO<E> getDAO(Class<E> entityClass) throws TopiaException { if (entityClass == null) { throw new IllegalArgumentException( - I18n._("topia.persistence.error.null.parameter", - "getDAO", "entityClass")); + I18n._("topia.persistence.error.null.param", + "entityClass", "getDAO")); } if (getRootContext() == this) { throw new TopiaException( @@ -712,6 +713,7 @@ return result; } + @SuppressWarnings({"unchecked"}) @Override public <E extends TopiaEntity, D extends TopiaDAO<E>> D getDAO(Class<E> entityClass, Class<D> daoClass) throws TopiaException { @@ -806,7 +808,7 @@ @Override public void rollbackTransaction() throws TopiaException { - if (getRootContext() == this) { + if (this.equals(getRootContext())) { throw new TopiaException(I18n._( "topia.persistence.error.unsupported.operation.on.root.context", "rollback")); @@ -865,7 +867,7 @@ // on se desenregistre du context pere et on ferme les connexions si // on est pas le root context - if (getRootContext() != this) { + if (!this.equals(getRootContext())) { closed = true; hibernate.close(); getParentContext().removeChildContext(this); @@ -908,6 +910,7 @@ /* -------------------- GLOBAL OPERATIONS ON SCHEMA ----------------------*/ + @SuppressWarnings({"unchecked"}) @Override public TopiaEntity findByTopiaId(String id) throws TopiaException { checkClosed(I18n._( @@ -925,6 +928,7 @@ return query.execute(this); } + @SuppressWarnings({"unchecked"}) @Override public TopiaQuery createQuery(Class<?> entityClass, String alias) { return new TopiaQuery((Class<? extends TopiaEntity>)entityClass, alias); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2010-08-21 16:01:23 UTC (rev 2103) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2010-08-21 16:02:52 UTC (rev 2104) @@ -510,7 +510,7 @@ * Detecte si un attribut fait partie d'une clef metier. * * @param attribute l'attribut à tester - * @return <code>true</code> si l'attribut fait partie d'une clef metier, + * @return {@code true} si l'attribut fait partie d'une clef metier, * <code>false</cdoe> sinon. */ public static boolean isNaturalId(ObjectModelAttribute attribute) { @@ -901,8 +901,8 @@ * une clef metier est non mutable. * * @param clazz la classe a tester - * @return <code>true</code> si le tag value a ete positionne sur la classe - * via le tag {@link #TAG_NATURAL_ID_MUTABLE}, <code>false</code> + * @return {@code true} si le tag value a ete positionne sur la classe + * via le tag {@link #TAG_NATURAL_ID_MUTABLE}, {@code false} * sinon. */ public static boolean isNaturalIdMutable(ObjectModelClass clazz) { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityEnum.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityEnum.java 2010-08-21 16:01:23 UTC (rev 2103) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityEnum.java 2010-08-21 16:02:52 UTC (rev 2104) @@ -101,8 +101,8 @@ * </pre> * * @param klass the type of an entity to test. - * @return <code>true</code> if given type is dealed directly by this entity, - * <code>false</code> otherwise. + * @return {@code true} if given type is dealed directly by this entity, + * {@code false} otherwise. */ boolean accept(Class<? extends TopiaEntity> klass); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java 2010-08-21 16:01:23 UTC (rev 2103) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java 2010-08-21 16:02:52 UTC (rev 2104) @@ -229,7 +229,7 @@ * * @param name le nom de la propriete d'association * @param bean l'instance a interroger - * @return <code>true</code> si pas d'entite d'association + * @return {@code true} si pas d'entite d'association */ public boolean isChildEmpty(String name, B bean) { int index = checkAssociationPropertyIndex(name); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2010-08-21 16:01:23 UTC (rev 2103) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2010-08-21 16:02:52 UTC (rev 2104) @@ -443,6 +443,7 @@ * @return l'ensemble des contrats d'entites * @since 2.2.0 */ + @SuppressWarnings({"unchecked"}) public static Class<? extends TopiaEntity>[] getContracts( TopiaEntityEnum[] contracts) { Class<?>[] result = new Class<?>[contracts.length]; @@ -1023,6 +1024,7 @@ return result; } + @SuppressWarnings({"unchecked"}) public static Set<Class<? extends TopiaEntity>> getInterfaces( Class<? extends TopiaEntity> klass, Set<Class<? extends TopiaEntity>> klassInterfaces) { @@ -1090,10 +1092,6 @@ for (E e : entityList) { E e2 = (E) srcCtxt.findByTopiaId(e.getTopiaId()); if (e2 == null && !canBeNull) { -// if (!canBeNull) { -// throw new IllegalStateException( -// "topia.replication.engine.error.entity.must.exists"); -// } continue; } srcList.add(e2); @@ -1129,8 +1127,8 @@ Object value) { if (value == null) { throw new NullPointerException( - _("topia.replication.engine.error.null.param", - parameterName, methodName)); + _("topia.persistence.error.null.param", + methodName, parameterName)); } } @@ -1145,8 +1143,7 @@ public static void checkSize(int size, Object[] params) { if (params.length != size) { throw new IllegalArgumentException( - "l'operation requiere " + size + " parametres mais en a " + - params.length); + _("topia.persistence.error.invalid.size", size, params.length)); } } @@ -1157,15 +1154,14 @@ Object value = params[index]; if (value == null) { throw new IllegalArgumentException( - "le parametre de positiion" + index + " est null!"); + _("topia.persistence.error.null.param.in.array", index)); } Class<?> foundType = value.getClass(); if (!requiredType.isAssignableFrom(foundType)) { throw new IllegalArgumentException( - "le paremetre de position " + index + - " requiere un parametre de type " + requiredType + - " mais est de type " + foundType); + _("topia.persistence.error.invalid.type.in.array", + index, requiredType, foundType)); } } } Modified: trunk/topia-persistence/src/main/resources/i18n/topia-persistence-en_GB.properties =================================================================== --- trunk/topia-persistence/src/main/resources/i18n/topia-persistence-en_GB.properties 2010-08-21 16:01:23 UTC (rev 2103) +++ trunk/topia-persistence/src/main/resources/i18n/topia-persistence-en_GB.properties 2010-08-21 16:02:52 UTC (rev 2104) @@ -1,35 +1,32 @@ -topia.persistence.error.class.not.found= -topia.persistence.error.context.already.closed= -topia.persistence.error.context.is.closed= -topia.persistence.error.create.schema= -topia.persistence.error.empty.doc= -topia.persistence.error.no.hibernate.session= -topia.persistence.error.null.parameter= -topia.persistence.error.on.backup= -topia.persistence.error.on.clear= -topia.persistence.error.on.commit= -topia.persistence.error.on.export= -topia.persistence.error.on.loding.xml.doc= -topia.persistence.error.on.operation= -topia.persistence.error.on.query= -topia.persistence.error.on.replicate= -topia.persistence.error.on.restore= -topia.persistence.error.on.rollback= -topia.persistence.error.query.dao.notDefined=DAO not defined in TopiaQuery, can't execute it without TopiaContext -topia.persistence.error.replicate.entity= -topia.persistence.error.replicate.on.same.context= -topia.persistence.error.rootContext.access= -topia.persistence.error.service.not.found= -topia.persistence.error.service.not.retreaved= -topia.persistence.error.service.unknown= -topia.persistence.error.unsupported.class= -topia.persistence.error.unsupported.operation.on.closed.context= -topia.persistence.error.unsupported.operation.on.root.context= -topia.persistence.error.update.schema= -topia.persistence.service.loaded= -topia.persistence.supported.classes.for.context= -topia.persistence.warn.service.not.find= -topia.persistence.warn.service.not.found= -topia.persistence.warn.service.not.loaded= -topia.persistence.warn.service.not.postInit= -topia.persistence.warn.service.not.preInit= +topia.persistence.error.class.not.found=Persistence class %1$s not found +topia.persistence.error.context.already.closed=Context was alredy closed +topia.persistence.error.context.is.closed=Context is closed, no operation is possible. +topia.persistence.error.create.schema=Schema could not be created for following reason \: %1$s +topia.persistence.error.empty.doc=Empty document +topia.persistence.error.no.hibernate.session=No hinernate session found, you must at first, open a new transaction via 'beaginTransaction' method. +topia.persistence.error.null.param=The method '%1$s' requires a non null parameter '%2$s'. +topia.persistence.error.on.backup=An error occurs while backup operation \: %1$s +topia.persistence.error.on.clear=An error occurs while clear operation \: %1$s +topia.persistence.error.on.commit=An error occurs while commit operation \: %1$s +topia.persistence.error.on.export=An error occurs while export operation \: %1$s +topia.persistence.error.on.loding.xml.doc=Could not read xml document for following reason \: %1$s +topia.persistence.error.on.query=An error occurs while query operation \: %1$s +topia.persistence.error.on.replicate=An error occurs while replicate operation \: %1$s +topia.persistence.error.on.restore=An error occurs while restore operation \: %1$s +topia.persistence.error.on.rollback=An error occurs while rollback operation \: %1$s +topia.persistence.error.replicate.entity=Could not replicate entity '%1$s' pour following reason \: %2$s +topia.persistence.error.replicate.on.same.context=Can not do a replication operation on same database. +topia.persistence.error.rootContext.access=You are on root context, you MUST open a transaction to perform any database access. +topia.persistence.error.service.not.found=The service %1$s was not found. +topia.persistence.error.service.not.retreaved=Could not retrive service %1$s for following reason \: %2$s +topia.persistence.error.service.unknown=The service %1$s of type %2$s was not found. +topia.persistence.error.unsupported.class=The following entity type %1$s is not managed by this context, you probably forgot to declare it. +topia.persistence.error.unsupported.operation.on.closed.context=This context is closed, it is not possible to release the operation '%1$s' +topia.persistence.error.unsupported.operation.on.root.context=Operation '%1$s' not possible on root context (use a sub transaction). +topia.persistence.error.update.schema=Schema could not be updated for following reason \: %1$s +topia.persistence.service.loaded=Service '%1$s' loaded (implementation %2$s) +topia.persistence.supported.classes.for.context=List of supported persistence classes \: %1$s +topia.persistence.warn.service.not.found=The service named '%1$s' could not be found for following reason \: \: %2$s +topia.persistence.warn.service.not.loaded=The service with key '%1$s' has a different name '%2$s' \! (service not activated) +topia.persistence.warn.service.not.postInit=The service named '%1$s' could not be pre-initialized (service not activated) +topia.persistence.warn.service.not.preInit=The service named '%1$s' could not be post-initialized (service not activated) Modified: trunk/topia-persistence/src/main/resources/i18n/topia-persistence-fr_FR.properties =================================================================== --- trunk/topia-persistence/src/main/resources/i18n/topia-persistence-fr_FR.properties 2010-08-21 16:01:23 UTC (rev 2103) +++ trunk/topia-persistence/src/main/resources/i18n/topia-persistence-fr_FR.properties 2010-08-21 16:02:52 UTC (rev 2104) @@ -4,7 +4,7 @@ topia.persistence.error.create.schema=Le sch\u00E9ma n'a pas pu \u00EAtre cr\u00E9e pour la raison suivante \: %2$s topia.persistence.error.empty.doc=Document vide topia.persistence.error.no.hibernate.session=Aucune session hibernate trouv\u00E9e, vous devez d\u00E9marr\u00E9 une transaction avec la m\u00E9thode 'beginTransaction' -topia.persistence.error.null.parameter=Le param\u00E8tre %1$s de la m\u00E9thode %2$s ne peut pas \u00EAtre null\! +topia.persistence.error.null.param=La m\u00E9thode '%1$s' requi\u00E8re un param\u00E8tre '%2$s' non null. topia.persistence.error.on.backup=Une erreur est apparue pendant la sauvegarde \: %1$s topia.persistence.error.on.clear=Une erreur est apparue pendant le nettoyage \: %1$s topia.persistence.error.on.commit=Une erreur est apparue pendant le commit \: %1$s @@ -14,7 +14,6 @@ topia.persistence.error.on.replicate=Une erreur est apparue pendant la replication \: %1$s topia.persistence.error.on.restore=Une erreur est apparue pendant le restore \: %1$s topia.persistence.error.on.rollback=Une erreur est apparue pendant le rollback \: %1$s -topia.persistence.error.query.dao.notDefined=Aucun dao n'est d\u00E9fini dans la TopiaQuery, impossible de l'ex\u00E9cuter sans TopiaContext. topia.persistence.error.replicate.entity=Echec de replication de l'entite %1$s\npour la raison suivante \: %2$s topia.persistence.error.replicate.on.same.context=Impossible de dupliquer dans la m\u00EAme base topia.persistence.error.rootContext.access=Vous \u00EAtes sur le root context, vous devez ouvrir une transaction pour pouvoir acc\u00E9der aux donn\u00E9es.