branch develop updated (1e2dcae -> 9cb38f5)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 1e2dcae oubli d'un fixme non commenté new 9cb38f5 correction d'imports The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 9cb38f51d6b064dbb03d11fcdc2bb8f8394ab989 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 16 11:08:54 2015 +0200 correction d'imports Summary of changes: .../src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java | 7 +++---- .../src/main/java/fr/ird/observe/ui/admin/report/ReportModel.java | 4 ++-- .../src/main/java/fr/ird/observe/ui/admin/report/ReportUI.jaxx | 2 +- .../main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java | 6 +++--- .../main/java/fr/ird/observe/ui/admin/report/ResultTableModel.java | 4 ++-- 5 files changed, 11 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 9cb38f51d6b064dbb03d11fcdc2bb8f8394ab989 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 16 11:08:54 2015 +0200 correction d'imports --- .../src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java | 7 +++---- .../src/main/java/fr/ird/observe/ui/admin/report/ReportModel.java | 4 ++-- .../src/main/java/fr/ird/observe/ui/admin/report/ReportUI.jaxx | 2 +- .../main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java | 6 +++--- .../main/java/fr/ird/observe/ui/admin/report/ResultTableModel.java | 4 ++-- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java index 425ca35..467e13c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java @@ -22,12 +22,13 @@ package fr.ird.observe.ui.admin; import fr.ird.observe.ObserveConfig; -import fr.ird.observe.business.ObserveTechnicalException; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceConfig; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DbMode; -import fr.ird.observe.services.service.actions.report.model.Report; +import fr.ird.observe.business.report.model.Report; +import fr.ird.observe.business.validation.ValidationModelMode; +import fr.ird.observe.business.validation.ValidatorsMap; import fr.ird.observe.ui.admin.consolidate.ConsolidateModel; import fr.ird.observe.ui.admin.export.ExportModel; import fr.ird.observe.ui.admin.gps.ImportGPSModel; @@ -37,8 +38,6 @@ import fr.ird.observe.ui.admin.synchronize.SynchronizeModel; import fr.ird.observe.ui.admin.validate.ValidateModel; import fr.ird.observe.ui.storage.StorageUIHandler; import fr.ird.observe.ui.storage.StorageUIModel; -import fr.ird.observe.business.validation.ValidationModelMode; -import fr.ird.observe.business.validation.ValidatorsMap; import jaxx.runtime.swing.wizard.ext.WizardExtModel; import jaxx.runtime.swing.wizard.ext.WizardState; import org.apache.commons.lang3.StringUtils; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportModel.java index ee337b4..0e5d458 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportModel.java @@ -21,9 +21,9 @@ */ package fr.ird.observe.ui.admin.report; +import fr.ird.observe.business.report.ReportBuilder; +import fr.ird.observe.business.report.model.Report; import fr.ird.observe.business.report.model.ReportExecute; -import fr.ird.observe.services.dto.actions.report.Report; -import fr.ird.observe.services.service.actions.report.ReportBuilder; import fr.ird.observe.ui.admin.AdminActionModel; import fr.ird.observe.ui.admin.AdminStep; import org.apache.commons.logging.Log; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUI.jaxx index 6944485..edd7726 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUI.jaxx @@ -30,7 +30,7 @@ fr.ird.observe.ui.admin.AdminStep fr.ird.observe.ui.admin.AdminTabUI fr.ird.observe.ui.admin.AdminUI - fr.ird.observe.services.service.actions.report.model.Report + fr.ird.observe.business.report.model.Report java.awt.Dimension diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java index 893457c..ce32612 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java @@ -23,11 +23,11 @@ package fr.ird.observe.ui.admin.report; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; +import fr.ird.observe.business.report.model.DataMatrix; +import fr.ird.observe.business.report.model.Report; import fr.ird.observe.business.report.model.ReportExecute; +import fr.ird.observe.business.report.model.ReportVariable; import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; -import fr.ird.observe.services.service.actions.report.model.ReportVariable; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.admin.AdminStep; import fr.ird.observe.ui.admin.AdminTabUI; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ResultTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ResultTableModel.java index f6b8f1a..ebbdcf9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ResultTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ResultTableModel.java @@ -21,8 +21,8 @@ */ package fr.ird.observe.ui.admin.report; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; +import fr.ird.observe.business.report.model.DataMatrix; +import fr.ird.observe.services.dto.actions.report.Report; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm