This is an automated email from the git hooks/post-receive script. New change to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git discards 360fd05 [jgitflow-maven-plugin]Updating develop poms back to pre merge state discards 0618db0 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts discards 94f5263 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC3' with non-snapshot versions discards 055b734 add missing license headers discards da613b2 [jgitflow-maven-plugin]updating poms for 4.0-RC4-SNAPSHOT development discards 30befff use last release of topia discards e93fc76 add migration db for tests discards 42101d5 refs #6991 ajout migration pour renommage du palangrier inconnu discards 5915a0c refs #6983 mise à jour aussi du topiaversion discards 9753766 refs #6475 revue de la décoration des calées discards 4645d56 refs #6475 ajout des traductions françaises à partir du fichier fourni dans le ticket discards 6dc7d9a refs #6988 bien réinitilisé le quadrant sur les écrans d'activité discards 2836c5d refs #6986 revue de la gestion du quadrant sur l'écran d'opération de peche palangre discards 4dfb4f0 refs #6976 Add default measurements when creating a new gearusefeature discards b5eb644 refs #6975 mise en lazy de GearCaracteristicType car toujours utilise discards d010e19 refs #6983 Ajout migration de usedInTrip pour l'engin Senne pour toutes les marées de type senne discards a6da7de refs #6977 amélioration du layout discards 1df36b0 refs #6978 ajout icone pour l'action de consolidation des données discards ba5988f passage sur topia en snapshot pour la generation des index discards c4dcfe0 refs #6964 migration 4.0-RC3 pour ajouter les index sur fk manquants + regeneration de ces index via hibernate discards 62068e3 refs #6964 ajout de l'id de la marée à repliquer This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/feature/6944 (e14b489) \ O -- O -- O (360fd05) Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: observe-business/pom.xml | 2 +- .../src/main/java/fr/ird/observe/DataService.java | 28 -- .../main/java/fr/ird/observe/DecoratorService.java | 2 - .../java/fr/ird/observe/db/ReplicationService.java | 4 +- .../test/resources/db/4.0-RC3/referentiel.sql.gz | Bin 138124 -> 0 bytes observe-entities/pom.xml | 2 +- .../src/main/java/fr/ird/observe/entities/Set.java | 3 - .../observe/entities/longline/SetLonglineImpl.java | 26 +- .../migration/AbstractDataSourceMigration.java | 5 +- .../DataSourceMigrationForVersion_4_0_RC3.java | 282 --------------------- .../ird/observe/entities/seine/SetSeineImpl.java | 8 +- .../db/4.0-RC3/add-foreign-key-indexes-PG.sql | 65 ----- .../db/4.0-RC3/rename-unknown-longliner-H2.sql | 22 -- .../db/4.0-RC3/rename-unknown-longliner-PG.sql | 22 -- .../db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql | 22 -- .../db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql | 22 -- .../src/main/xmi/observe-common.properties | 4 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 2 +- observe-swing/pom.xml | 2 +- .../src/main/filters/observe-ui.properties | 1 - .../ird/observe/ui/content/ContentUIHandler.java | 28 -- .../ui/content/impl/longline/SetLonglineUI.css | 8 +- .../impl/longline/SetLonglineUIHandler.java | 42 --- .../content/impl/longline/SetLonglineUIModel.java | 8 +- .../observe/ui/content/impl/seine/SetSeineUI.jaxx | 72 +++--- .../impl/longline/ActivityLonglineUIHandler.java | 16 -- .../open/impl/seine/ActivitySeineUIHandler.java | 15 -- .../impl/seine/GearUseFeaturesSeineTableModel.java | 37 +-- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 20 -- .../ui/tree/AbstractObserveTreeCellRenderer.java | 10 - .../loadors/ActivityLonglineNodeChildLoador.java | 1 - .../tree/loadors/ActivitySeineNodeChildLoador.java | 1 - .../EditableTableWithCacheTableModelSupport.java | 4 +- .../resources/i18n/observe-swing_en_GB.properties | 2 - .../resources/i18n/observe-swing_es_ES.properties | 2 - .../resources/i18n/observe-swing_fr_FR.properties | 140 +++++----- observe-validation/pom.xml | 2 +- .../i18n/observe-validation_fr_FR.properties | 12 +- pom.xml | 4 +- 40 files changed, 148 insertions(+), 802 deletions(-) delete mode 100644 observe-business/src/test/resources/db/4.0-RC3/referentiel.sql.gz delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java delete mode 100644 observe-entities/src/main/resources/db/4.0-RC3/add-foreign-key-indexes-PG.sql delete mode 100644 observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-H2.sql delete mode 100644 observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-PG.sql delete mode 100644 observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql delete mode 100644 observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.