Author: athimel Date: 2014-04-11 18:08:01 +0200 (Fri, 11 Apr 2014) New Revision: 3062 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3062 Log: Remove usages of deprecated '_' method Modified: branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 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 16:06:18 UTC (rev 3061) +++ branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2014-04-11 16:08:01 UTC (rev 3062) @@ -278,9 +278,9 @@ boolean complete = migrateSchema(); if (!complete) { if (log.isErrorEnabled()) { - log.error(_("topia.migration.migration.incomplete")); + log.error(t("topia.migration.migration.incomplete")); } - throw new TopiaRuntimeException(_("topia.migration.migration.incomplete")); + throw new TopiaRuntimeException(t("topia.migration.migration.incomplete")); } } @@ -297,7 +297,7 @@ Version version = callback.getApplicationVersion(); - log.info(_("topia.migration.start.migration", + log.info(t("topia.migration.start.migration", version.getVersion(), dbVersion.getVersion()) ); @@ -317,7 +317,7 @@ if (versionTableExist && dbVersion.equals(version)) { if (log.isInfoEnabled()) { - log.info(_("topia.migration.skip.migration.db.is.up.to.date")); + log.info(t("topia.migration.skip.migration.db.is.up.to.date")); } // la base est a jour return true; @@ -325,7 +325,7 @@ // Aucune version existante, la base de données est vierge if (versionTableExist && dbNotVersioned && migrateOnInit) { - log.info(_("topia.migration.skip.migration.db.is.empty")); + log.info(t("topia.migration.skip.migration.db.is.empty")); // la base est vierge, aucune migration nécessaire // mise à jour de la table tmsversion saveApplicationVersion(); @@ -337,7 +337,7 @@ // on a trouvee une table depreciee tmsVersion avec la bonne version de base // il suffit donc d'enregister la version dans la nouvelle table if (log.isInfoEnabled()) { - log.info(_("topia.migration.skip.migration.db.is.up.to.date")); + log.info(t("topia.migration.skip.migration.db.is.up.to.date")); } // la base est a jour mais il faut migrer la table saveApplicationVersion(); @@ -348,7 +348,7 @@ new TreeSet<Version>(new VersionComparator()); allVersions.addAll(Arrays.asList(callback.getAvailableVersions())); if (log.isInfoEnabled()) { - log.info(_("topia.migration.available.versions", allVersions)); + log.info(t("topia.migration.available.versions", allVersions)); } // tell if migration is needed @@ -367,11 +367,11 @@ if (versionsToApply.isEmpty()) { if (log.isInfoEnabled()) { - log.info(_("topia.migration.skip.migration.no.version.to.apply")); + log.info(t("topia.migration.skip.migration.no.version.to.apply")); } } else { if (log.isInfoEnabled()) { - log.info(_("topia.migration.migrate.versions", versionsToApply)); + log.info(t("topia.migration.migrate.versions", versionsToApply)); } // perform the migration @@ -459,7 +459,7 @@ TMSVersionDAO.deleteAll(tx); if (log.isInfoEnabled()) { - log.info(_("topia.migration.saving.db.version", version)); + log.info(t("topia.migration.saving.db.version", version)); } // create new version and store it in table @@ -577,7 +577,7 @@ if (v != null) { if (log.isDebugEnabled()) { - log.debug("Legacy : " + _("topia.migration.detected.db.version", v)); + log.debug("Legacy : " + t("topia.migration.detected.db.version", v)); } } } @@ -590,9 +590,9 @@ // etre detenu en local v = Version.VZERO; dbNotVersioned = true; - log.info(_("topia.migration.db.not.versionned")); + log.info(t("topia.migration.db.not.versionned")); } else { - log.info(_("topia.migration.detected.db.version", v)); + log.info(t("topia.migration.detected.db.version", v)); } dbVersion = v; versionDetected = true;