- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] use last release of eugene
by Tony CHEMIT 06 Jul '17

06 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ef73fadf by Tony CHEMIT at 2017-07-06T10:21:04+02:00 use last release of eugene - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -170,7 +170,7 @@ <mavenVersion>3.5.0</mavenVersion> - <eugenePluginVersion>3.0-SNAPSHOT</eugenePluginVersion> + <eugenePluginVersion>3.0-alpha-11</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion>  <licensePluginVersion>1.9</licensePluginVersion> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ef73fadf14d7dd81f68e4800061… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ef73fadf14d7dd81f68e4800061… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Affichage des heures sur l'écran de synchro avancée du référentiel (See #689)
by Tony CHEMIT 05 Jul '17

05 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3b0bd578 by Tony CHEMIT at 2017-07-05T14:14:15+02:00 Affichage des heures sur l'écran de synchro avancée du référentiel (See #689) - - - - - 0b91b599 by Tony CHEMIT at 2017-07-05T14:14:42+02:00 Sur la sycnrho avancée de référentiel, on doit pouvoir accepter des modifications depuis aussi des bases locales - - - - - 2 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java @@ -143,13 +143,13 @@ public class ReferentialSynchroUIHandler extends AdminTabUIHandler<ReferentialSy if (model.getConfigModel().getCentralSourceModel().getDbMode() == null) { return; } - boolean leftToRightEnabled = Optional.ofNullable(model.getConfigModel().getCentralSourceModel().getDataSourceInformation()) + boolean leftToRightEnabled = model.getConfigModel().getCentralSourceModel().isLocal() || Optional.ofNullable(model.getConfigModel().getCentralSourceModel().getDataSourceInformation()) .map(ObserveDataSourceInformation::canWriteReferential) .orElse(false); if (log.isDebugEnabled()) { log.debug("Update synchro modes: leftToRight: " + leftToRightEnabled); } - boolean rightToLeftEnabled = Optional.ofNullable(model.getConfigModel().getLocalSourceModel().getDataSourceInformation()) + boolean rightToLeftEnabled = model.getConfigModel().getLocalSourceModel().isLocal() || Optional.ofNullable(model.getConfigModel().getLocalSourceModel().getDataSourceInformation()) .map(ObserveDataSourceInformation::canWriteReferential) .orElse(false); if (log.isDebugEnabled()) { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java @@ -28,34 +28,27 @@ import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.ReferentialSynchroNodeSupport; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.TypeReferentialSynchroNode; import fr.ird.observe.services.dto.reference.ReferentialReference; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.decorator.Decorator; - -import javax.swing.Icon; -import javax.swing.JTree; -import javax.swing.tree.DefaultTreeCellRenderer; import java.awt.Color; import java.awt.Component; import java.text.DateFormat; import java.text.SimpleDateFormat; +import javax.swing.Icon; +import javax.swing.JTree; +import javax.swing.tree.DefaultTreeCellRenderer; +import org.nuiton.decorator.Decorator; + import static org.nuiton.i18n.I18n.t; /** - * Le renderer pour décorer l'arbre de sélection des données. - * * @author Tony Chemit - dev(a)tchemit.fr * @since 1.2 */ public class ReferentialSynchronizeTreeCellRenderer extends DefaultTreeCellRenderer { - /** Logger */ - private static final Log log = LogFactory.getLog(ReferentialSynchronizeTreeCellRenderer.class); - private static final long serialVersionUID = 1L; - private final DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyy hh:mm"); + private final DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyy HH:mm"); protected transient DecoratorService decoratorService; @@ -105,7 +98,7 @@ public class ReferentialSynchronizeTreeCellRenderer extends DefaultTreeCellRende ReferenceReferentialSynchroNodeSupport node1 = (ReferenceReferentialSynchroNodeSupport) node; icon = node1.getIcon(); - ReferentialReference reference = node1.getUserObject(); + ReferentialReference<?> reference = node1.getUserObject(); Decorator<?> decorator = getDecoratorService().getReferentialReferenceDecorator(reference.getType()); text = "<html><body>" + decorator.toString(reference); text += " <i>(" + reference.getVersion() + " - " + dateFormat.format(reference.getLastUpdateDate()) + ")</i>"; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/02bf1386e0d2e83b28aa58208e… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/02bf1386e0d2e83b28aa58208e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Rename ping method to getModelVersion + clean code
by Tony CHEMIT 05 Jul '17

05 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 02bf1386 by Tony CHEMIT at 2017-07-05T10:19:21+02:00 Rename ping method to getModelVersion + clean code - - - - - 8 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java - application-web/src/main/filtered-resources/mapping - application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java - services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java - services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java - services/src/main/java/fr/ird/observe/services/service/PingService.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java @@ -1701,7 +1701,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { if (!error) { - Version modelServerVersion = pingService.ping(); + Version modelServerVersion = pingService.getModelVersion(); Version clientModelVersion = getModelVersion(); if (!Objects.equals(clientModelVersion, modelServerVersion)) { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java @@ -205,7 +205,7 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI> { PingService pingService = dataSource.newPingService(); - Version modelServerVersion = pingService.ping(); + Version modelServerVersion = pingService.getModelVersion(); if (!modelVersion.equals(modelServerVersion)) { ===================================== application-web/src/main/filtered-resources/mapping ===================================== --- a/application-web/src/main/filtered-resources/mapping +++ b/application-web/src/main/filtered-resources/mapping @@ -76,8 +76,8 @@ GET /api/v1/DataSourceService/migrateData GET /api/v1/DataSourceService/open v1.DataSourceServiceController.open GET /api/v1/LastUpdateDateService/updateDataLastUpdateDates v1.LastUpdateDateServiceController.updateDataLastUpdateDates GET /api/v1/LastUpdateDateService/updateReferentialLastUpdateDates v1.LastUpdateDateServiceController.updateReferentialLastUpdateDates +GET /api/v1/PingService/getModelVersion v1.PingServiceController.getModelVersion GET /api/v1/PingService/getServerVersion v1.PingServiceController.getServerVersion -GET /api/v1/PingService/ping v1.PingServiceController.ping GET /api/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffService/getEnabledReferentialReferenceSet v1.actions.synchro.referential.diff.ReferentialSynchronizeDiffServiceController.getEnabledReferentialReferenceSet GET /api/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffService/getSourceReferentialStates v1.actions.synchro.referential.diff.ReferentialSynchronizeDiffServiceController.getSourceReferentialStates GET /api/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService/filterIdsUsedInLocalSource v1.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalServiceController.filterIdsUsedInLocalSource ===================================== application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java ===================================== --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java @@ -35,7 +35,7 @@ import org.nuiton.version.Versions; public class PingServiceController extends ObserveWebMotionController implements PingService { @Override - public Version ping() { + public Version getModelVersion() { return getApplicationConfiguration().getModelVersion(); } ===================================== services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java ===================================== --- a/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java @@ -81,7 +81,7 @@ public class RestTestMethodResource extends TestMethodResourceSupport<RestTestCl PingService service = testClassResource.newService(dataSourceConfiguration, PingService.class); try { - Version serverVersion = service.ping(); + Version serverVersion = service.getModelVersion(); Version modelVersion = ObserveTestConfiguration.getModelVersion(); if (!serverVersion.equals(modelVersion)) { serverExist = false; ===================================== services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java ===================================== --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java @@ -45,7 +45,7 @@ public class PingServiceRestTest extends AbstractServiceRestTest { dataSourceConfiguration.setServerUrl(new URL("http://fake_" + System.nanoTime())); PingService service = REST_TEST_CLASS_RESOURCE.newService(dataSourceConfiguration, PingService.class); - service.ping(); + service.getModelVersion(); } @@ -57,7 +57,7 @@ public class PingServiceRestTest extends AbstractServiceRestTest { dataSourceConfiguration.setLogin("fake_" + System.nanoTime()); PingService service = REST_TEST_CLASS_RESOURCE.newService(dataSourceConfiguration, PingService.class); - service.ping(); + service.getModelVersion(); } ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java @@ -22,23 +22,22 @@ package fr.ird.observe.services.topia.service; * #L% */ -import com.google.common.base.Optional; -import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.entities.LastUpdateDate; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.ObserveEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; +import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.services.service.LastUpdateDateService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.support.TopiaSqlQuery; - import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; +import java.util.Optional; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.persistence.support.TopiaSqlQuery; /** * Created on 07/09/16. @@ -69,10 +68,10 @@ public class LastUpdateDateServiceTopia extends ObserveServiceTopia implements L private <E extends ObserveEntity> void updateLastUpdateDate(Class<E> entityType) { - Optional<LastUpdateDate> optionalLastUpdateDate = getTopiaPersistenceContext().getLastUpdateDateDao() + Optional<LastUpdateDate> optionalLastUpdateDate = Optional.ofNullable(getTopiaPersistenceContext().getLastUpdateDateDao() .forTypeEquals(entityType.getName()) .setOrderByArguments(LastUpdateDate.PROPERTY_LAST_UPDATE_DATE + " DESC") - .tryFindFirst(); + .tryFindFirst().orNull()); if (!optionalLastUpdateDate.isPresent()) { return; @@ -90,7 +89,7 @@ public class LastUpdateDateServiceTopia extends ObserveServiceTopia implements L @Override public PreparedStatement prepareQuery(Connection connection) throws SQLException { - return connection.prepareStatement("SELECT max(lastUpdateDate)::TIMESTAMP FROM " + schemaName + "." + tableName); + return connection.prepareStatement(String.format("SELECT max(lastUpdateDate)::TIMESTAMP FROM %s.%s", schemaName, tableName)); } @Override @@ -102,7 +101,7 @@ public class LastUpdateDateServiceTopia extends ObserveServiceTopia implements L if (maxLastUpdateDate != null && lastUpdateDate.getLastUpdateDate().before(maxLastUpdateDate)) { if (log.isInfoEnabled()) { - log.info("Update LastUpdateDate for " + entityType.getName() + " with value: " + maxLastUpdateDate); + log.info(String.format("Update LastUpdateDate for %s with value: %s", entityType.getName(), maxLastUpdateDate)); } lastUpdateDate.setLastUpdateDate(maxLastUpdateDate); } ===================================== services/src/main/java/fr/ird/observe/services/service/PingService.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/PingService.java +++ b/services/src/main/java/fr/ird/observe/services/service/PingService.java @@ -34,7 +34,7 @@ import org.nuiton.version.Version; public interface PingService extends ObserveService { @NoDataAccess - Version ping(); + Version getModelVersion(); @NoDataAccess Version getServerVersion(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/02bf1386e0d2e83b28aa58208e2… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/02bf1386e0d2e83b28aa58208e2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Rename ping method to getModelVersion + clean code
by Tony CHEMIT 05 Jul '17

05 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4d83d499 by Tony CHEMIT at 2017-07-05T10:17:26+02:00 Rename ping method to getModelVersion + clean code - - - - - 7 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java - application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java - services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java - services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java - services/src/main/java/fr/ird/observe/services/service/PingService.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java @@ -1701,7 +1701,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { if (!error) { - Version modelServerVersion = pingService.ping(); + Version modelServerVersion = pingService.getModelVersion(); Version clientModelVersion = getModelVersion(); if (!Objects.equals(clientModelVersion, modelServerVersion)) { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java @@ -205,7 +205,7 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI> { PingService pingService = dataSource.newPingService(); - Version modelServerVersion = pingService.ping(); + Version modelServerVersion = pingService.getModelVersion(); if (!modelVersion.equals(modelServerVersion)) { ===================================== application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java ===================================== --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java @@ -35,7 +35,7 @@ import org.nuiton.version.Versions; public class PingServiceController extends ObserveWebMotionController implements PingService { @Override - public Version ping() { + public Version getModelVersion() { return getApplicationConfiguration().getModelVersion(); } ===================================== services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java ===================================== --- a/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java @@ -81,7 +81,7 @@ public class RestTestMethodResource extends TestMethodResourceSupport<RestTestCl PingService service = testClassResource.newService(dataSourceConfiguration, PingService.class); try { - Version serverVersion = service.ping(); + Version serverVersion = service.getModelVersion(); Version modelVersion = ObserveTestConfiguration.getModelVersion(); if (!serverVersion.equals(modelVersion)) { serverExist = false; ===================================== services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java ===================================== --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java @@ -45,7 +45,7 @@ public class PingServiceRestTest extends AbstractServiceRestTest { dataSourceConfiguration.setServerUrl(new URL("http://fake_" + System.nanoTime())); PingService service = REST_TEST_CLASS_RESOURCE.newService(dataSourceConfiguration, PingService.class); - service.ping(); + service.getModelVersion(); } @@ -57,7 +57,7 @@ public class PingServiceRestTest extends AbstractServiceRestTest { dataSourceConfiguration.setLogin("fake_" + System.nanoTime()); PingService service = REST_TEST_CLASS_RESOURCE.newService(dataSourceConfiguration, PingService.class); - service.ping(); + service.getModelVersion(); } ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java @@ -22,23 +22,22 @@ package fr.ird.observe.services.topia.service; * #L% */ -import com.google.common.base.Optional; -import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.entities.LastUpdateDate; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.ObserveEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; +import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.services.service.LastUpdateDateService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.support.TopiaSqlQuery; - import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; +import java.util.Optional; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.persistence.support.TopiaSqlQuery; /** * Created on 07/09/16. @@ -69,10 +68,10 @@ public class LastUpdateDateServiceTopia extends ObserveServiceTopia implements L private <E extends ObserveEntity> void updateLastUpdateDate(Class<E> entityType) { - Optional<LastUpdateDate> optionalLastUpdateDate = getTopiaPersistenceContext().getLastUpdateDateDao() + Optional<LastUpdateDate> optionalLastUpdateDate = Optional.ofNullable(getTopiaPersistenceContext().getLastUpdateDateDao() .forTypeEquals(entityType.getName()) .setOrderByArguments(LastUpdateDate.PROPERTY_LAST_UPDATE_DATE + " DESC") - .tryFindFirst(); + .tryFindFirst().orNull()); if (!optionalLastUpdateDate.isPresent()) { return; @@ -90,7 +89,7 @@ public class LastUpdateDateServiceTopia extends ObserveServiceTopia implements L @Override public PreparedStatement prepareQuery(Connection connection) throws SQLException { - return connection.prepareStatement("SELECT max(lastUpdateDate)::TIMESTAMP FROM " + schemaName + "." + tableName); + return connection.prepareStatement(String.format("SELECT max(lastUpdateDate)::TIMESTAMP FROM %s.%s", schemaName, tableName)); } @Override @@ -102,7 +101,7 @@ public class LastUpdateDateServiceTopia extends ObserveServiceTopia implements L if (maxLastUpdateDate != null && lastUpdateDate.getLastUpdateDate().before(maxLastUpdateDate)) { if (log.isInfoEnabled()) { - log.info("Update LastUpdateDate for " + entityType.getName() + " with value: " + maxLastUpdateDate); + log.info(String.format("Update LastUpdateDate for %s with value: %s", entityType.getName(), maxLastUpdateDate)); } lastUpdateDate.setLastUpdateDate(maxLastUpdateDate); } ===================================== services/src/main/java/fr/ird/observe/services/service/PingService.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/PingService.java +++ b/services/src/main/java/fr/ird/observe/services/service/PingService.java @@ -34,7 +34,7 @@ import org.nuiton.version.Version; public interface PingService extends ObserveService { @NoDataAccess - Version ping(); + Version getModelVersion(); @NoDataAccess Version getServerVersion(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4d83d4994ee94d9ceca74ff80d9… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4d83d4994ee94d9ceca74ff80d9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Vérifier la parfaite adéquation version serveur / version client (see #703)
by Tony CHEMIT 04 Jul '17

04 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 57b3dc7f by Tony CHEMIT at 2017-07-05T00:07:39+02:00 Vérifier la parfaite adéquation version serveur / version client (see #703) - - - - - 9 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SectionsTableModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - application-web/src/main/filtered-resources/mapping - application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java - services/src/main/java/fr/ird/observe/services/service/PingService.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java @@ -501,8 +501,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong template = sectionTemplates.get(0); - boolean compiliantWithBasketCount = template.isCompiliantWithBasketCount(basketsCount); - if (!compiliantWithBasketCount) { + boolean compliantWithBasketCount = template.isCompiliantWithBasketCount(basketsCount); + if (!compliantWithBasketCount) { if (log.isWarnEnabled()) { log.warn("sectionTemplate " + template + " is not compliant with basketCount: " + basketsCount); ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SectionsTableModel.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SectionsTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SectionsTableModel.java @@ -153,9 +153,9 @@ public class SectionsTableModel extends LonglineCompositionTableModelSupport<Sec // check if can use this template int basketsCount = row.sizeBasket(); - boolean compiliantWithBasketCount = sectionTemplate.isCompiliantWithBasketCount(basketsCount); + boolean compliantWithBasketCount = sectionTemplate.isCompiliantWithBasketCount(basketsCount); - if (!compiliantWithBasketCount) { + if (!compliantWithBasketCount) { // We can't use this value if (log.isWarnEnabled()) { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java @@ -76,6 +76,7 @@ import org.nuiton.jaxx.runtime.JAXXContext; import org.nuiton.jaxx.runtime.swing.wizard.WizardModel; import org.nuiton.jaxx.runtime.swing.wizard.WizardUILancher; import org.nuiton.version.Version; +import org.nuiton.version.Versions; import static fr.ird.observe.application.swing.ui.admin.AdminUIModel.LOG_PROPERTY_CHANGE_LISTENER; @@ -1684,17 +1685,34 @@ public class StorageUIModel extends WizardModel<StorageStep> { PingService pingService = dataSource.newPingService(); - Version modelServerVersion = pingService.ping(); - - if (!getModelVersion().equals(modelServerVersion)) { + Version serverVersion = pingService.getServerVersion(); + Version clientVersion = ObserveSwingApplicationContext.get().getConfig().getVersion(); + if (clientVersion.isSnapshot()) { + clientVersion=Versions.removeSnapshot(clientVersion); + } + if (!Objects.equals(serverVersion, clientVersion)) { - connexionStatusError = t("observe.storage.error.serverVersionMismatch", modelServerVersion, getModelVersion()); + connexionStatusError = t("observe.storage.error.serverVersionMismatch", serverVersion, clientVersion); setConnexionStatus(ConnexionStatus.FAILED); error = true; } + if (!error) { + + Version modelServerVersion = pingService.ping(); + + Version clientModelVersion = getModelVersion(); + if (!Objects.equals(clientModelVersion, modelServerVersion)) { + + connexionStatusError = t("observe.storage.error.serverVersionModelMismatch", modelServerVersion, clientModelVersion); + + setConnexionStatus(ConnexionStatus.FAILED); + + error = true; + } + } } if (!error) { ===================================== application-swing/src/main/resources/i18n/application-swing_en_GB.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -1684,13 +1684,14 @@ observe.storage.config.right.storage=Right data source configuration observe.storage.config.source.storage=Configuration of data source to update observe.storage.config.target.storage=Configuration of target data source observe.storage.error.badUrl=The url format is not valid (%s) -observe.storage.error.dbVersionMismatch=Version of remote database (%s) is not compiliant with the model version (%s) +observe.storage.error.dbVersionMismatch=Version of remote database (%s) is not compliant with the model version (%s) observe.storage.error.rest.database.unknownForUser=Database "%s" is not defined for user "%s" observe.storage.error.rest.password.bad=Password is not valid observe.storage.error.rest.pasword.required=Password is mandatory observe.storage.error.rest.user.required=User login is mandatory observe.storage.error.rest.user.unknown=User "%s" is not defined on server -observe.storage.error.serverVersionMismatch=Remote server version (%s) is not compiliant with the model version (%s) +observe.storage.error.serverVersionMismatch=Remote server version (%s) is not compliant with the client version (%s) +observe.storage.error.serverVersionModelMismatch=Remote server model version (%s) is not compliant with the client model version (%s) observe.storage.import.data.fromBackup=Import data from a backup of a local database (*.sql.gz) observe.storage.import.data.fromRemoteStorage=Import data from a remote database observe.storage.import.data.fromServerStorage=Import data from a remove server ===================================== application-swing/src/main/resources/i18n/application-swing_es_ES.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -1693,6 +1693,7 @@ observe.storage.error.rest.pasword.required=Le contraseña es obligatoria observe.storage.error.rest.user.required=El usuario es obligatorio observe.storage.error.rest.user.unknown=El usuario "%s" no es conocido del servidor observe.storage.error.serverVersionMismatch=La versión del servidor remoto (%s) no es compatible con la versión del modelo (%s) +observe.storage.error.serverVersionModelMismatch=La version du modèle du serveur distant (%s) n'est pas compatible avec la version du modèle du client (%s) \#TODO observe.storage.import.data.fromBackup=Importar los datos de una copia de seguridad de una base local (*.sql.gz) observe.storage.import.data.fromRemoteStorage=Importar los datos de una base remota observe.storage.import.data.fromServerStorage=Importar los datos de un servidor remoto ===================================== application-swing/src/main/resources/i18n/application-swing_fr_FR.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -1697,12 +1697,13 @@ observe.storage.error.rest.password.bad=Le mot de passe est invalide observe.storage.error.rest.pasword.required=Le mot de passe est obligatoire observe.storage.error.rest.user.required=L'utilisateur est obligatoire observe.storage.error.rest.user.unknown=L'utilisateur "%s" est inconnu sur le serveur -observe.storage.error.serverVersionMismatch=La version du serveur distant (%s) n'est pas compatible avec la version du modèle (%s) +observe.storage.error.serverVersionMismatch=La version du serveur distant (%s) n'est pas compatible avec la version du client (%s) +observe.storage.error.serverVersionModelMismatch=La version du modèle du serveur distant (%s) n'est pas compatible avec la version du modèle du client (%s) observe.storage.import.data.fromBackup=Importer les données depuis une sauvegarde de base locale (*.sql.gz) observe.storage.import.data.fromRemoteStorage=Importer les données depuis une base distante observe.storage.import.data.fromServerStorage=Importer les données depuis un serveur distant observe.storage.importExternalDump.config=Sélection de la sauvegarde à utiliser -observe.storage.importExternalDump.description=Veuillez sélectionner le fichier d'une sauvegarde (*.sql.gz). +observe.storage.importExternalDump.description=Veuillez sélectionner le fichier d'une sauvegarde (*.sql.gz). observe.storage.importExternalDumpData.config=Choisir la sauvegarde contenant les données à importer observe.storage.importExternalDumpReferentiel.config=Choisir la sauvegarde contenant le référentiel à importer observe.storage.importRemoteStorage.config=Sélection de la base distante à importer ===================================== application-web/src/main/filtered-resources/mapping ===================================== --- a/application-web/src/main/filtered-resources/mapping +++ b/application-web/src/main/filtered-resources/mapping @@ -76,6 +76,7 @@ GET /api/v1/DataSourceService/migrateData GET /api/v1/DataSourceService/open v1.DataSourceServiceController.open GET /api/v1/LastUpdateDateService/updateDataLastUpdateDates v1.LastUpdateDateServiceController.updateDataLastUpdateDates GET /api/v1/LastUpdateDateService/updateReferentialLastUpdateDates v1.LastUpdateDateServiceController.updateReferentialLastUpdateDates +GET /api/v1/PingService/getServerVersion v1.PingServiceController.getServerVersion GET /api/v1/PingService/ping v1.PingServiceController.ping GET /api/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffService/getEnabledReferentialReferenceSet v1.actions.synchro.referential.diff.ReferentialSynchronizeDiffServiceController.getEnabledReferentialReferenceSet GET /api/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffService/getSourceReferentialStates v1.actions.synchro.referential.diff.ReferentialSynchronizeDiffServiceController.getSourceReferentialStates ===================================== application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java ===================================== --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java @@ -22,10 +22,10 @@ package fr.ird.observe.application.web.controller.v1; * #L% */ -import fr.ird.observe.application.web.configuration.ObserveWebApplicationConfig; import fr.ird.observe.application.web.controller.ObserveWebMotionController; import fr.ird.observe.services.service.PingService; import org.nuiton.version.Version; +import org.nuiton.version.Versions; /** * Created on 06/09/15. @@ -34,11 +34,16 @@ import org.nuiton.version.Version; */ public class PingServiceController extends ObserveWebMotionController implements PingService { + @Override public Version ping() { + return getApplicationConfiguration().getModelVersion(); + } - ObserveWebApplicationConfig configuration = getApplicationConfiguration(); - - return configuration.getModelVersion(); + @Override + public Version getServerVersion() { + Version buildVersion = getApplicationConfiguration().getBuildVersion(); + return buildVersion.isSnapshot() ? Versions.removeSnapshot(buildVersion) : buildVersion; } + } ===================================== services/src/main/java/fr/ird/observe/services/service/PingService.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/PingService.java +++ b/services/src/main/java/fr/ird/observe/services/service/PingService.java @@ -36,4 +36,7 @@ public interface PingService extends ObserveService { @NoDataAccess Version ping(); + @NoDataAccess + Version getServerVersion(); + } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/57b3dc7f2c550608f4f6d79f3b0… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/57b3dc7f2c550608f4f6d79f3b0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] add contribution guide to add a referential [skip ci]
by Tony CHEMIT 02 Jul '17

02 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e99890d3 by Tony CHEMIT at 2017-07-02T13:50:01+02:00 add contribution guide to add a referential [skip ci] - - - - - 1 changed file: - CONTRIBUTING.md Changes: ===================================== CONTRIBUTING.md ===================================== --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -61,21 +61,11 @@ will fails in services-binder * register in fr.ird.observe.services.ObserveReferentialReferenceSets * register in fr.ird.observe.services.ObserveFormRequests * register in fr.ird.observe.application.swing.decoration.DecoratorService.modelInitializer class -* add i18n key observe.type.objectMaterialType in applicationswing-decoration i18n bundle -* add i18n key observe.type.objectMaterialTypes in applicationswing-decoration i18n bundle +* add i18n key observe.type.objectMaterialType in application-swing-decoration i18n bundle +* add i18n key observe.type.objectMaterialTypes in application-swing-decoration i18n bundle * add service validation in services-validation/src/main/resources/fr/ird/observe/entities/referentiel - * services-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectMaterialType-service-error-validation.xml - * services-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectMaterialType-service-warning-validation.xml * add swing validation in application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential - * application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialTypeDto-ui-create-error-validation.xml - * application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialTypeDto-ui-create-warning-validation.xml - * application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialTypeDto-ui-update-error-validation.xml - * application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialTypeDto-ui-update-warning-validation.xml * add swing referential editor - * application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialTypeUIModel.java - * application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialTypeUIHandler.java - * application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialTypeUI.jaxx - * application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialTypeUI.jcss * build `mvn clean install -DskipTests` View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e99890d3377504461ca8e8a5601… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e99890d3377504461ca8e8a5601… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Improve model (remove skip on constants enumeration)
by Tony CHEMIT 01 Jul '17

01 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fe85c9d5 by Tony CHEMIT at 2017-07-01T12:48:29+02:00 Improve model (remove skip on constants enumeration) - - - - - fa5f909c by Tony CHEMIT at 2017-07-01T18:45:25+02:00 Adaptation pour le nouveau formulaire DPC (See #577) - - - - - 30 changed files: - CONTRIBUTING.md - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialTypeDto-ui-create-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialTypeDto-ui-create-warning-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialTypeDto-ui-update-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialTypeDto-ui-update-warning-validation.xml - application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties - application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CopyFloatingObjectPartToLeftAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CopyFloatingObjectPartToRightAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectPartsTreeNode.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialTypeUI.jaxx - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialTypeUI.jcss - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialTypeUIHandler.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialTypeUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialUI.jcss - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - persistence/src/main/java/fr/ird/observe/persistence/Entities.java - persistence/src/main/models/Observe.model - persistence/src/main/resources/db/migration/6.901/02_add_object_material-common.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/3f679de164581f012abb06abdc… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/3f679de164581f012abb06abdc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: fix site build
by Tony CHEMIT 01 Jul '17

01 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 592f734f by Tony CHEMIT at 2017-07-01T11:57:34+02:00 fix site build - - - - - 8ba9dd89 by Tony CHEMIT at 2017-07-01T11:57:42+02:00 L'application reste en espagnol après redémarrage (See #710) - - - - - 683c9790 by Tony CHEMIT at 2017-07-01T11:57:42+02:00 Gestion des objets flottants de référence (See #787) - - - - - 3f679de1 by Tony CHEMIT at 2017-07-01T11:57:42+02:00 Suppression de la table observe_longline.sizemeasuretype ? (See #780) - - - - - 30 changed files: - .gitlab-ci.yml - application-swing-configuration/src/main/config/ObserveSwingApplication.ini - application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java - + application-swing/src/main/java/fr/ird/observe/application/swing/FloatingObjectReferencesManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveUIMode.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddFloatingObjectReferenceUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditFloatingObjectReferenceUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/RemoveFloatingObjectReferenceUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/dcprefs/DeleteReferenceUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/dcprefs/QuitUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/dcprefs/SaveReferenceUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageActionSupport.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageActionSupport.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowFloatingObjectReferencesAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ab94677a3f93af196dae7c84c5… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ab94677a3f93af196dae7c84c5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Gestion des objets flottants de référence (See #787)
by Tony CHEMIT 30 Jun '17

30 Jun '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ab94677a by Tony CHEMIT at 2017-06-30T23:50:07+02:00 Gestion des objets flottants de référence (See #787) - - - - - 30 changed files: - application-swing-configuration/src/main/config/ObserveSwingApplication.ini - application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java - + application-swing/src/main/java/fr/ird/observe/application/swing/FloatingObjectReferencesManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveUIMode.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddFloatingObjectReferenceUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditFloatingObjectReferenceUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/RemoveFloatingObjectReferenceUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/dcprefs/DeleteReferenceUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/dcprefs/QuitUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/dcprefs/SaveReferenceUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowFloatingObjectReferencesAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUI.jaxx - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUI.jcss - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUIHandler.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUIModel.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ab94677a3f93af196dae7c84c56… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ab94677a3f93af196dae7c84c56… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: fix site build
by Tony CHEMIT 30 Jun '17

30 Jun '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f6b80c70 by Tony CHEMIT at 2017-06-30T14:46:53+02:00 fix site build - - - - - c1fae2b3 by Tony CHEMIT at 2017-06-30T16:55:13+02:00 L'application reste en espagnol après redémarrage (See #710) - - - - - 6 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageActionSupport.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageActionSupport.java - − src/site/markdown/model.md - src/site/site_fr.xml Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java @@ -571,9 +571,7 @@ public abstract class ObserveRunner extends ApplicationRunner { ObserveMainUI ui = ObserveMainUIInitializer.initUI(context, config); - UIHelper.setMainUIVisible(ui); - - context.getSwingSessionHelper().addComponent(ui, false); + ObserveMainUIInitializer.setMainUIVisible(context,ui, false); return ui; } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java @@ -42,6 +42,29 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.StringNavigatio import fr.ird.observe.application.swing.ui.util.ObserveSwingValidatorMessageTableModel; import fr.ird.observe.application.swing.ui.util.ObserveValidatorMessageTableRenderer; import fr.ird.observe.services.dto.constants.ReferentialLocale; +import java.awt.Component; +import java.awt.Container; +import java.awt.Cursor; +import java.awt.Dimension; +import java.awt.event.ComponentAdapter; +import java.awt.event.ComponentEvent; +import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.Objects; +import javax.swing.AbstractButton; +import javax.swing.JComponent; +import javax.swing.JSplitPane; +import javax.swing.JTree; +import javax.swing.KeyStroke; +import javax.swing.SwingUtilities; +import javax.swing.border.Border; +import javax.swing.border.LineBorder; +import javax.swing.event.TreeSelectionEvent; +import javax.swing.tree.TreePath; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; @@ -50,17 +73,6 @@ import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel; import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; import org.nuiton.jaxx.widgets.error.ErrorDialogUI; -import javax.swing.*; -import javax.swing.border.Border; -import javax.swing.border.LineBorder; -import javax.swing.event.TreeSelectionEvent; -import javax.swing.tree.TreePath; -import java.awt.*; -import java.awt.event.*; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.Objects; import static fr.ird.observe.application.swing.ui.content.ContentUIInitializer.OBSERVE_ACTION; import static org.nuiton.i18n.I18n.t; @@ -81,11 +93,11 @@ public class ObserveMainUIInitializer { private final ObserveMainUI ui; - public ObserveMainUIInitializer(ObserveMainUI ui) { + ObserveMainUIInitializer(ObserveMainUI ui) { this.ui = ui; } - public void changeNavigationNode(TreeSelectionEvent event) { + private void changeNavigationNode(TreeSelectionEvent event) { ObserveSwingDataSource source = ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource(); if (source == null || !source.isOpen()) { @@ -150,7 +162,7 @@ public class ObserveMainUIInitializer { } } - public void doOpencontent(ObserveMainUI ui, TreePath path, Class<? extends ContentUI<?, ?>> uiClass) { + private void doOpencontent(ObserveMainUI ui, TreePath path, Class<? extends ContentUI<?, ?>> uiClass) { ContentUIManager manager = ui.getContentUIManager(); @@ -367,10 +379,23 @@ public class ObserveMainUIInitializer { } // show ui - UIHelper.setMainUIVisible(ui); + setMainUIVisible(rootContext, ui, true); + } + + public static void setMainUIVisible(ObserveSwingApplicationContext rootContext, ObserveMainUI ui, boolean replace) { + + // force le redimensionnement du splitpane + ui.getSplitpane().revalidate(); + + // force le redimensionnement du splitpane2 + ui.getSplitpane2().revalidate(); + + // affichage de l'interface graphique + SwingUtilities.invokeLater(() -> ui.setVisible(true)); + rootContext.getSwingSessionHelper().addComponent(ui, replace); } - protected void initialize() { + void initialize() { ObserveActionMap actionMap = ui.getObserveActionMap(); @@ -483,14 +508,14 @@ public class ObserveMainUIInitializer { private Border focusBorder; private Border noFocusBorder; - public Border getFocusBorder() { + private Border getFocusBorder() { if (focusBorder == null) { focusBorder = new LineBorder(ObserveSwingApplicationContext.get().getConfig().getFocusBorderColor(), 3, true); } return focusBorder; } - public Border getNoFocusBorder() { + private Border getNoFocusBorder() { if (noFocusBorder == null) { noFocusBorder = new LineBorder(ObserveSwingApplicationContext.get().getConfig().getNoFocusBorderColor(), 3, true); } @@ -513,7 +538,7 @@ public class ObserveMainUIInitializer { } } - protected void updateBusyState(boolean busy) { + private void updateBusyState(boolean busy) { if (busy) { // ui bloquee if (log.isDebugEnabled()) { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageActionSupport.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageActionSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageActionSupport.java @@ -63,6 +63,7 @@ public abstract class ChangeApplicationLanguageActionSupport extends AbstractUIA // sauvegarde de la nouvelle locale config.setLocale(newLocale); + config.saveForUser(); ObserveUICallback.ui.run(); } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageActionSupport.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageActionSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageActionSupport.java @@ -66,6 +66,7 @@ public abstract class ChangeDbLanguageActionSupport extends AbstractUIAction { // sauvegarde de la nouvelle locale config.setDbLocale(newLocale.getLocale()); + config.saveForUser(); ObserveUICallback.ui.run(); } ===================================== src/site/markdown/model.md deleted ===================================== --- a/src/site/markdown/model.md +++ /dev/null @@ -1,19 +0,0 @@ -# ObServe - model - -Vous trouverez sur cette page les liens vers la modélisation de la couche de persistence. - -Nous maintenons pour le moment deux versions de ce modèle sur le format *zargo*. - -## Version 5 - -* [model commun](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisat… -* [model senne](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisati… -* [model palangre](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelis… -* [model properties](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/model… - -## Version 7 - -* [model commun](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisat… -* [model senne](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisati… -* [model palangre](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelis… -* [model properties](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/model… ===================================== src/site/site_fr.xml ===================================== --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -80,10 +80,13 @@ </menu> <menu name="Modélisation"> - <item name="Fichier argoUML (commun)" href="model/observe-common.zargo"/> - <item name="Fichier argoUML (Seine)" href="model/observe-seine.zargo"/> - <item name="Fichier argoUML (Palangre)" href="model/observe-longline.zargo"/> - <item name="Modèle physique" href="model/observe_mpd.pdf"/> + <item name="Fichier argoUML (commun) v7" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…"/> + <item name="Fichier argoUML (Seine) v7" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…"/> + <item name="Fichier argoUML (Palangre) v7" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…"/> + <item name="Fichier argoUML (commun) v5" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…"/> + <item name="Fichier argoUML (Seine) v5" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…"/> + <item name="Fichier argoUML (Palangre) v5" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…"/> + <item name="Modèle physique" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…"/> </menu> <menu ref="reports"/> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/79713d64d7780515a210014152… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/79713d64d7780515a210014152… You're receiving this email because of your account on gitlab.com.

1 0