[Topia-commits] r3061 - in branches/topia-2.9.x: topia-persistence/src/main/java/org/nuiton/topia/framework topia-persistence/src/main/java/org/nuiton/topia/persistence/util topia-service-migration/src/main/java/org/nuiton/topia/migration topia-service-replication/src/main/java/org/nuiton/topia/replication topia-service-replication/src/main/java/org/nuiton/topia/replication/operation topia-service-replication/src/test/java/org/nuiton/topia/replication/operation

Author: athimel Date: 2014-04-11 18:06:18 +0200 (Fri, 11 Apr 2014) New Revision: 3061 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3061 Log: Remove usages of deprecated '_' method Modified: branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java branches/topia-2.9.x/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UncreatableOperation.java Modified: branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2014-04-11 14:51:41 UTC (rev 3060) +++ branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2014-04-11 16:06:18 UTC (rev 3061) @@ -24,7 +24,7 @@ package org.nuiton.topia.framework; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.beans.PropertyChangeListener; import java.io.BufferedInputStream; @@ -236,15 +236,15 @@ TopiaService service = (TopiaService) newInstance; if (key.equals("topia.service." + service.getServiceName())) { result.put(service.getServiceName(), service); - log.info(_("topia.persistence.service.loaded", + log.info(t("topia.persistence.service.loaded", key, classService)); } else { - log.warn(_("topia.persistence.warn.service.not.loaded", + log.warn(t("topia.persistence.warn.service.not.loaded", key, service.getServiceName())); } } catch (Throwable eee) { String message = - _("topia.persistence.error.service.unknown", + t("topia.persistence.error.service.unknown", key, classService); if (log.isDebugEnabled()) { log.debug(message, eee); @@ -260,7 +260,7 @@ protected void preInitServices(Map<String, TopiaService> services) { for (TopiaService service : services.values()) { if (!service.preInit(this)) { - log.warn(_("topia.persistence.warn.service.not.preInit", + log.warn(t("topia.persistence.warn.service.not.preInit", service.getServiceName())); } } @@ -269,7 +269,7 @@ protected void postInitServices(Map<String, TopiaService> services) { for (TopiaService service : services.values()) { if (!service.postInit(this)) { - log.warn(_("topia.persistence.warn.service.not.postInit", + log.warn(t("topia.persistence.warn.service.not.postInit", service.getServiceName())); } } @@ -334,13 +334,13 @@ result = (E) getService(name); } catch (Exception eee) { throw new TopiaNotFoundException( - _("topia.persistence.error.service.not.retreaved", + t("topia.persistence.error.service.not.retreaved", interfaceService, getProperExceptionMessage(eee)), eee); } if (result == null) { throw new TopiaNotFoundException( - _("topia.persistence.error.service.not.found", + t("topia.persistence.error.service.not.found", interfaceService)); } return result; @@ -354,7 +354,7 @@ String name = getServiceName(interfaceService); result = serviceEnabled(name); } catch (Exception eee) { - String message = _("topia.persistence.warn.service.not.found", + String message = t("topia.persistence.warn.service.not.found", interfaceService, getProperExceptionMessage(eee)); if (log.isDebugEnabled()) { log.debug(message, eee); @@ -455,7 +455,7 @@ getFiresSupport().firePostCreateSchema(this); } catch (HibernateException eee) { throw new TopiaException( - _("topia.persistence.error.create.schema", + t("topia.persistence.error.create.schema", eee.getMessage()), eee); } } @@ -467,7 +467,7 @@ execute(true, false, false, true); } catch (HibernateException eee) { throw new TopiaException( - _("topia.persistence.error.create.schema", + t("topia.persistence.error.create.schema", eee.getMessage()), eee); } } @@ -485,7 +485,7 @@ getFiresSupport().firePostUpdateSchema(this); } catch (HibernateException eee) { throw new TopiaException( - _("topia.persistence.error.update.schema", + t("topia.persistence.error.update.schema", eee.getMessage()), eee); } } @@ -494,7 +494,7 @@ public Session getHibernate() throws TopiaException { if (hibernate == null) { throw new TopiaException( - _("topia.persistence.error.no.hibernate.session")); + t("topia.persistence.error.no.hibernate.session")); } return hibernate; } @@ -592,7 +592,7 @@ log.debug("Class " + classname + " not found"); } throw new TopiaNotFoundException( - _("topia.persistence.error.class.not.found", + t("topia.persistence.error.class.not.found", classname)); } persistenceClasses.add(clazz); @@ -645,12 +645,12 @@ throws TopiaException { if (entityClass == null) { throw new IllegalArgumentException( - _("topia.persistence.error.null.param", + t("topia.persistence.error.null.param", "entityClass", "getDAO")); } if (equals(getRootContext())) { throw new TopiaException( - _("topia.persistence.error.rootContext.access")); + t("topia.persistence.error.rootContext.access")); } if (getHibernateFactory().getClassMetadata(entityClass) == null && getHibernateFactory().getClassMetadata( @@ -658,10 +658,10 @@ getHibernateFactory().getClassMetadata( entityClass.getName() + "Abstract") == null) { - log.info(_("topia.persistence.supported.classes.for.context", + log.info(t("topia.persistence.supported.classes.for.context", getHibernateFactory().getAllClassMetadata().keySet())); throw new TopiaException( - _("topia.persistence.error.unsupported.class", + t("topia.persistence.error.unsupported.class", entityClass.getName())); } @@ -698,7 +698,7 @@ @Override public TopiaContext beginTransaction() throws TopiaException { - checkClosed(_("topia.persistence.error.context.is.closed")); + checkClosed(t("topia.persistence.error.context.is.closed")); TopiaContextImpl result = new TopiaContextImpl(this); SessionFactory factory = getHibernateFactory(); @@ -732,7 +732,7 @@ } throw new TopiaException( - _("topia.persistence.error.open.transaction.failed", + t("topia.persistence.error.open.transaction.failed", eee.getMessage()), eee); } @@ -748,10 +748,10 @@ @Override public void commitTransaction() throws TopiaException { if (equals(getRootContext())) { - throw new TopiaException(_("topia.persistence.error.unsupported.operation.on.root.context", + throw new TopiaException(t("topia.persistence.error.unsupported.operation.on.root.context", "commit")); } - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "commit")); try { @@ -778,7 +778,7 @@ // hibernate = getHibernateFactory().openSession(); // hibernate.setFlushMode(FlushMode.NEVER); } catch (Exception eee) { - throw new TopiaException(_("topia.persistence.error.on.commit", + throw new TopiaException(t("topia.persistence.error.on.commit", eee.getMessage()), eee); } } @@ -786,10 +786,10 @@ @Override public void rollbackTransaction() throws TopiaException { if (equals(getRootContext())) { - throw new TopiaException(_("topia.persistence.error.unsupported.operation.on.root.context", + throw new TopiaException(t("topia.persistence.error.unsupported.operation.on.root.context", "rollback")); } - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "rollback")); try { // for (TopiaDAO<? extends TopiaEntity> dao : daoCache.values()) { @@ -816,7 +816,7 @@ } catch (HibernateException eee) { throw new TopiaException( - _("topia.persistence.error.on.rollback", + t("topia.persistence.error.on.rollback", eee.getMessage()), eee); } } @@ -824,7 +824,7 @@ @Override public void closeContext() throws TopiaException { // Throw exception if context is already closed - checkClosed(_("topia.persistence.error.context.already.closed")); + checkClosed(t("topia.persistence.error.context.already.closed")); // FD-20100421 : Ano #546 : no need to copy childContext, the // {@link #getChildContext()} provides a thread-safe copy to iterate @@ -909,7 +909,7 @@ @SuppressWarnings({"unchecked"}) @Override public TopiaEntity findByTopiaId(String id) throws TopiaException { - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "findById")); Class<TopiaEntity> entityClass = TopiaId.getClassName(id); @@ -931,7 +931,7 @@ @Override public List<?> findAll(String hql, Object... args) throws TopiaException { - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "findAll")); try { @@ -955,7 +955,7 @@ result = firesSupport.fireEntitiesLoad(this, result); return result; } catch (HibernateException eee) { - throw new TopiaException(_("topia.persistence.error.on.query", + throw new TopiaException(t("topia.persistence.error.on.query", hql, eee.getMessage()), eee); } } @@ -963,7 +963,7 @@ @Override public List<?> find(String hql, int startIndex, int endIndex, Object... args) throws TopiaException { - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "find")); try { @@ -989,7 +989,7 @@ result = firesSupport.fireEntitiesLoad(this, result); return result; } catch (HibernateException eee) { - throw new TopiaException(_("topia.persistence.error.on.query", + throw new TopiaException(t("topia.persistence.error.on.query", hql, eee.getMessage()), eee); } } @@ -997,7 +997,7 @@ @Override public Object findUnique(String hql, Object... paramNamesAndValues) throws TopiaException { - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "findUnique")); List<?> results = find(hql, 0, 1, paramNamesAndValues); @@ -1027,7 +1027,7 @@ */ @Override public int execute(String hql, Object... args) throws TopiaException { - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "find")); try { @@ -1038,14 +1038,14 @@ int result = query.executeUpdate(); return result; } catch (HibernateException eee) { - throw new TopiaException(_("topia.persistence.error.on.query", + throw new TopiaException(t("topia.persistence.error.on.query", hql, eee.getMessage()), eee); } } @Override public void add(TopiaEntity e) throws TopiaException { - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "add")); String id = e.getTopiaId(); @@ -1057,17 +1057,17 @@ @Override public void replicate(TopiaContext dstCtxt, Object... entityAndCondition) throws TopiaException, IllegalArgumentException { - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "replicate")); TopiaContextImpl dstContextImpl = (TopiaContextImpl) dstCtxt; dstContextImpl.checkClosed( - _("topia.persistence.error.unsupported.operation.on.closed.context", + t("topia.persistence.error.unsupported.operation.on.closed.context", "replicate")); if (getRootContext().equals(dstContextImpl.getRootContext())) { throw new IllegalArgumentException( - _("topia.persistence.error.replicate.on.same.context")); + t("topia.persistence.error.replicate.on.same.context")); } String[] queries = buildQueries(entityAndCondition); @@ -1085,7 +1085,7 @@ } } } catch (HibernateException eee) { - throw new TopiaException(_("topia.persistence.error.on.replicate", + throw new TopiaException(t("topia.persistence.error.on.replicate", eee.getMessage()), eee); } } @@ -1094,15 +1094,15 @@ public <T extends TopiaEntity> void replicateEntity(TopiaContext dstCtxt, T entity) throws TopiaException, IllegalArgumentException { - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntity")); TopiaContextImpl dstContextImpl = (TopiaContextImpl) dstCtxt; - dstContextImpl.checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + dstContextImpl.checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntity")); if (getRootContext().equals(dstContextImpl.getRootContext())) { - throw new IllegalArgumentException(_( + throw new IllegalArgumentException(t( "topia.persistence.error.replicate.on.same.context")); } replicate0(dstContextImpl, entity); @@ -1112,15 +1112,15 @@ public <T extends TopiaEntity> void replicateEntities(TopiaContext dstCtxt, List<T> entities) throws TopiaException, IllegalArgumentException { - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntities")); TopiaContextImpl dstContextImpl = (TopiaContextImpl) dstCtxt; - dstContextImpl.checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + dstContextImpl.checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntities")); if (getRootContext().equals(dstContextImpl.getRootContext())) { - throw new IllegalArgumentException(_("topia.persistence.error.replicate.on.same.context")); + throw new IllegalArgumentException(t("topia.persistence.error.replicate.on.same.context")); } replicate0(dstContextImpl, entities.toArray()); } @@ -1141,7 +1141,7 @@ */ @Override public void backup(File file, boolean compress) throws TopiaException { - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "backup")); try { String options = ""; @@ -1154,7 +1154,7 @@ query.list(); } catch (Exception eee) { - throw new TopiaException(_( + throw new TopiaException(t( "topia.persistence.error.on.backup", eee.getMessage()), eee); } @@ -1171,7 +1171,7 @@ public void restore(File file) throws TopiaException { // send event getFiresSupport().firePreRestoreSchema(this); - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "restore")); String sql = null; @@ -1204,7 +1204,7 @@ // send event AFTER restore getFiresSupport().firePostRestoreSchema(this); } catch (Exception eee) { - throw new TopiaException(_( + throw new TopiaException(t( "topia.persistence.error.on.restore", sql, eee.getMessage()), eee); } @@ -1237,7 +1237,7 @@ // root.finalize(); } catch (Throwable eee) { throw new TopiaException( - _("topia.persistence.error.on.clear", eee.getMessage()), eee); + t("topia.persistence.error.on.clear", eee.getMessage()), eee); } } @@ -1259,7 +1259,7 @@ @Override public boolean isSchemaExist(Class<?> clazz) throws TopiaException { - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntity")); boolean result = TopiaUtil.isSchemaExist(this, clazz.getName()); return result; @@ -1452,7 +1452,7 @@ } } catch (HibernateException eee) { - throw new TopiaException(_("topia.persistence.error.on.replicate", + throw new TopiaException(t("topia.persistence.error.on.replicate", eee.getMessage()), eee); } } Modified: branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2014-04-11 14:51:41 UTC (rev 3060) +++ branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2014-04-11 16:06:18 UTC (rev 3061) @@ -24,7 +24,6 @@ package org.nuiton.topia.persistence.util; -import com.google.common.base.Function; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; @@ -56,7 +55,7 @@ import java.util.SortedMap; import java.util.TreeMap; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Une classe avec des méthodes utiles sur les entités. @@ -1146,7 +1145,7 @@ Object value) { if (value == null) { throw new NullPointerException( - _("topia.persistence.error.null.param", + t("topia.persistence.error.null.param", methodName, parameterName)); } } @@ -1162,7 +1161,7 @@ public static void checkSize(int size, Object[] params) { if (params.length != size) { throw new IllegalArgumentException( - _("topia.persistence.error.invalid.size", size, params.length)); + t("topia.persistence.error.invalid.size", size, params.length)); } } @@ -1173,13 +1172,13 @@ Object value = params[index]; if (value == null) { throw new IllegalArgumentException( - _("topia.persistence.error.null.param.in.array", index)); + t("topia.persistence.error.null.param.in.array", index)); } Class<?> foundType = value.getClass(); if (!requiredType.isAssignableFrom(foundType)) { throw new IllegalArgumentException( - _("topia.persistence.error.invalid.type.in.array", + t("topia.persistence.error.invalid.type.in.array", index, requiredType, foundType)); } } Modified: branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java =================================================================== --- branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2014-04-11 14:51:41 UTC (rev 3060) +++ branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2014-04-11 16:06:18 UTC (rev 3061) @@ -37,7 +37,7 @@ import java.sql.SQLException; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Abstract migration callback. @@ -114,7 +114,7 @@ try { - log.info(_("topia.migration.start.migrate", v)); + log.info(t("topia.migration.start.migrate", v)); migrateForVersion(v, tx, showSql, showProgression); @@ -167,7 +167,7 @@ if (log.isInfoEnabled()) { - log.info(_("topia.migration.start.sqls", sqls.length)); + log.info(t("topia.migration.start.sqls", sqls.length)); } if (showSql) { StringBuilder buffer = new StringBuilder(); @@ -195,7 +195,7 @@ String message = ""; if (showProgression) { - message = _("topia.migration.start.sql", index, max); + message = t("topia.migration.start.sql", index, max); } if (showSql) { message += "\n" + sql; @@ -213,7 +213,7 @@ } if (log.isDebugEnabled()) { String message; - message = _("topia.migration.end.sql", index, max, StringUtil.convertTime(System.nanoTime() - t0)); + message = t("topia.migration.end.sql", index, max, StringUtil.convertTime(System.nanoTime() - t0)); log.debug(message); } } Modified: branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java =================================================================== --- branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2014-04-11 14:51:41 UTC (rev 3060) +++ branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2014-04-11 16:06:18 UTC (rev 3061) @@ -51,7 +51,7 @@ import java.util.SortedSet; import java.util.TreeSet; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Le moteur de migration proposé par topia. Il est basé sur un {@link AbstractTopiaMigrationCallback} Modified: branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java =================================================================== --- branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java 2014-04-11 14:51:41 UTC (rev 3060) +++ branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java 2014-04-11 16:06:18 UTC (rev 3061) @@ -37,7 +37,7 @@ import java.util.Arrays; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Builder of {@link ReplicationModel}. @@ -127,7 +127,7 @@ if (operation == null) { throw new IllegalArgumentException( - _("topia.replication.error.unkown.operation", + t("topia.replication.error.unkown.operation", operationClass.getSimpleName(), Arrays.toString(getOperationProvider().getOperations())) ); @@ -136,7 +136,7 @@ ReplicationNode node = model.getNode(type); if (node == null) { throw new IllegalArgumentException( - _("topia.replication.error.unkown.owner.node", + t("topia.replication.error.unkown.owner.node", type, operationClass.getSimpleName(), model.getNodes()) Modified: branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java =================================================================== --- branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java 2014-04-11 14:51:41 UTC (rev 3060) +++ branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java 2014-04-11 16:06:18 UTC (rev 3061) @@ -42,7 +42,7 @@ import java.util.Collections; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Pour attacher une association. @@ -153,7 +153,7 @@ if (ownerIds == null || ownerIds.isEmpty()) { // pas de donnees a traiter - log.info(_("topia.replication.attachAssociation.nothing.to.do", + log.info(t("topia.replication.attachAssociation.nothing.to.do", ownerOperator)); return; } Modified: branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java =================================================================== --- branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java 2014-04-11 14:51:41 UTC (rev 3060) +++ branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java 2014-04-11 16:06:18 UTC (rev 3061) @@ -43,7 +43,7 @@ import java.util.Collections; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Pour attacher une association. @@ -131,7 +131,7 @@ if (ownerIds == null || ownerIds.isEmpty()) { // pas de donnees a traiter - log.info(_("topia.replication.attachAssociation.nothing.to.do", + log.info(t("topia.replication.attachAssociation.nothing.to.do", ownerOperator)); return; } Modified: branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java =================================================================== --- branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java 2014-04-11 14:51:41 UTC (rev 3060) +++ branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java 2014-04-11 16:06:18 UTC (rev 3061) @@ -40,7 +40,7 @@ import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Pour charger une association sur le noeud de l'operation. @@ -83,7 +83,7 @@ if (!ownerNode.equals(operationDef.getNode())) { throw new IllegalStateException( - _("topia.replication.error.operation.loadLink.illegalSource", + t("topia.replication.error.operation.loadLink.illegalSource", operationDef.getNode(), ownerNode)); } Modified: branches/topia-2.9.x/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UncreatableOperation.java =================================================================== --- branches/topia-2.9.x/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UncreatableOperation.java 2014-04-11 14:51:41 UTC (rev 3060) +++ branches/topia-2.9.x/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UncreatableOperation.java 2014-04-11 16:06:18 UTC (rev 3061) @@ -36,7 +36,7 @@ import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author tchemit <chemit@codelutin.com> @@ -51,7 +51,7 @@ Object... parameters) { throw new UnsupportedOperationException( - _("topia.replication.error.operation.uncreatable", getClass())); + t("topia.replication.error.operation.uncreatable", getClass())); } @Override