This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 5abc310859d024220d71073f00f5597f819b79a6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 24 19:07:53 2015 +0200 Renommage getModle en getModel --- .../src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java | 4 ++-- .../src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java | 8 ++++---- .../java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index cf9df56..dbdf8db 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -1184,7 +1184,7 @@ public class StorageUIHandler { addTag("h3", sb, t("observe.storage.report.action.migrate") + " :"); addOpenTag("ul", sb); if (model.isCanMigrate()) { - Version version = model.getModleVersion(); + Version version = model.getModelVersion(); addTag("li", sb, t("observe.storage.report.can.migrate", version)); if (model.isShowMigrationProgression()) { addTag("li", sb, t("observe.storage.showMigrationProgression")); @@ -1263,7 +1263,7 @@ public class StorageUIHandler { dataSource.doOpen(); Version importServiceDbVersion = dataSource.getDbVersion(); - Version currentDbVersion = model.getModleVersion(); + Version currentDbVersion = model.getModelVersion(); if (importServiceDbVersion.before(currentDbVersion)) { throw new IllegalStateException("Import db version (" + importServiceDbVersion + ") is not compatible with the current database version (" + currentDbVersion + ")"); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java index dfdd5de..b4fe772 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java @@ -1126,7 +1126,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { return doBackup; } - public Version getModleVersion() { + public Version getModelVersion() { return config == null ? Version.VZERO : config.getModelVersion(); } @@ -1685,7 +1685,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { Version versionDataSource = dataSource.getVersion(); - if (getModleVersion().equals(versionDataSource)) { + if (getModelVersion().equals(versionDataSource)) { setConnexionStatus(ConnexionStatus.SUCCESS); @@ -1693,7 +1693,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { } else { - connexionStatusError = t("observe.storage.error.dbVersionMismatch", versionDataSource, getModleVersion()); + connexionStatusError = t("observe.storage.error.dbVersionMismatch", versionDataSource, getModelVersion()); setConnexionStatus(ConnexionStatus.FAILED); @@ -1745,7 +1745,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { public void checkImportDbVersion(ObserveSwingDataSource source) { Version importServiceDbVersion = source.getVersion(); - Version currentDbVersion = getModleVersion(); + Version currentDbVersion = getModelVersion(); if (importServiceDbVersion.before(currentDbVersion)) { throw new IllegalStateException("Import db version (" + importServiceDbVersion + ") is not compatible with the current database version (" + currentDbVersion + ")"); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java index 1a5d591..7dfa946 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java @@ -435,7 +435,7 @@ public class StorageTabUIHandler { protected String updateCanMigrateLabel(ChooseDbModeUI ui, boolean canMigrate) { - String text = t("observe.storage.action.canMigrate", ui.getModel().getModleVersion()); + String text = t("observe.storage.action.canMigrate", ui.getModel().getModelVersion()); return text; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.