This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553_ajoute_un_widget_pour_les_arbres in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit c27e30b73025f80ede2ed12e3f342c84a5f7a67e Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Tue Aug 23 23:16:15 2016 +0200 Corrige les erreurs d'injection des objets de type Request/Result en implémentant le contrat ObserveDto refs #7677 --- .../web/ObserveWebApplicationListener.java | 2 - ...tionalReferntialSynchronizeRequestInjector.java | 75 ---------------------- ...nidirectionalReferentialSynchronizeRequest.java | 3 +- ...UnidirectionalReferentialSynchronizeResult.java | 3 +- 4 files changed, 4 insertions(+), 79 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java index b6b757c..f4bd444 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java @@ -31,7 +31,6 @@ import fr.ird.observe.application.web.injector.ObserveDataSourceConfigurationInj import fr.ird.observe.application.web.injector.ObserveDtoInjector; import fr.ird.observe.application.web.injector.ObserveReferenceSetRequestInjector; import fr.ird.observe.application.web.injector.SqlScriptProducerRequestInjector; -import fr.ird.observe.application.web.injector.UnidirectionalReferntialSynchronizeRequestInjector; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRestConstants; import fr.ird.observe.services.dto.ObserveDbUserDto; import org.apache.commons.logging.Log; @@ -72,7 +71,6 @@ public class ObserveWebApplicationListener implements WebMotionServerListener { context.addInjector(new DateInjector(ObserveDataSourceConfigurationRestConstants.DATE_PATTERN)); context.addInjector(new SqlScriptProducerRequestInjector(gson)); context.addInjector(new ImmutableSetInjector()); - context.addInjector(new UnidirectionalReferntialSynchronizeRequestInjector(gson)); context.addConverter(new ObserveDtoConverter(gson), ObserveDbUserDto.class); context.getServletContext().setAttribute( diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/UnidirectionalReferntialSynchronizeRequestInjector.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/UnidirectionalReferntialSynchronizeRequestInjector.java deleted file mode 100644 index 59f0ad6..0000000 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/UnidirectionalReferntialSynchronizeRequestInjector.java +++ /dev/null @@ -1,75 +0,0 @@ -package fr.ird.observe.application.web.injector; - -/*- - * #%L - * ObServe :: Application Web - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.base.Preconditions; -import com.google.gson.Gson; -import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeRequest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.debux.webmotion.server.call.Call; -import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler; -import org.debux.webmotion.server.mapping.Mapping; - -import java.lang.reflect.Type; - -/** - * @author Samuel Maisonneuve - maisonneuve@codelutin.com - */ -public class UnidirectionalReferntialSynchronizeRequestInjector implements ExecutorParametersInjectorHandler.Injector { - - /** Logger. */ - private static final Log log = LogFactory.getLog(UnidirectionalReferntialSynchronizeRequestInjector.class); - - protected final Gson gson; - - public UnidirectionalReferntialSynchronizeRequestInjector(Gson gson) { - this.gson = gson; - } - - @Override - public Object getValue(Mapping mapping, Call call, String name, Class<?> type, Type generic) { - - UnidirectionalReferentialSynchronizeRequest result = null; - - if (type.equals(UnidirectionalReferentialSynchronizeRequest.class)) { - - Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name); - - Preconditions.checkNotNull(parameterTree, "Le paramètre " + name + " n'as pas été trouvé, recompiler (parameter)!"); - - String gsonContent = ((String[]) parameterTree.getValue())[0]; - - result = gson.fromJson(gsonContent, UnidirectionalReferentialSynchronizeRequest.class); - - if (log.isInfoEnabled()) { - log.info("Inject UnidirectionalReferntialSynchronizeRequestInjector: " + result); - } - - } - - return result; - - } - -} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java index 4ec070a..6de789a 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java @@ -26,6 +26,7 @@ import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multiset; +import fr.ird.observe.services.dto.ObserveDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialMultimap; @@ -41,7 +42,7 @@ import java.util.Objects; * @author Tony Chemit - chemit@codelutin.com * @since 5.0 */ -public class UnidirectionalReferentialSynchronizeRequest<R extends ReferentialDto> { +public class UnidirectionalReferentialSynchronizeRequest<R extends ReferentialDto> implements ObserveDto { public static <R extends ReferentialDto> Builder<R> builder(Class<R> referentialName) { Objects.nonNull(referentialName); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeResult.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeResult.java index 52c46a0..2829d22 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeResult.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeResult.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.actions.synchro.referential.legacy; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; +import fr.ird.observe.services.dto.ObserveDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import org.apache.commons.lang3.tuple.Pair; @@ -40,7 +41,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 5.0 */ -public class UnidirectionalReferentialSynchronizeResult { +public class UnidirectionalReferentialSynchronizeResult implements ObserveDto { private final Set<Class<? extends ReferentialDto>> referentialNames; private final Multimap<Class<? extends ReferentialDto>, String> referentialAdded; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553_ajoute_un_widget_pour_les_arbres in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 1c0387f13fe16c7c6a2daa75c663a5e61623bb22 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Sun Aug 21 23:45:16 2016 +0200 Crée le composant BeanTreeHeader visant à offrir un group d'actions facilitant l'utilisation des composants arbre par l'utilisateur refs #7553 --- .../ird/observe/ui/util/tree/BeanTreeHeader.jaxx | 50 ++++++++++++++++ .../ird/observe/ui/util/tree/BeanTreeHeader.jcss | 67 ++++++++++++++++++++++ .../ui/util/tree/BeanTreeHeaderHandler.java | 45 +++++++++++++++ .../observe-application-swing_en_GB.properties | 11 ++-- .../observe-application-swing_es_ES.properties | 11 ++-- .../observe-application-swing_fr_FR.properties | 8 +-- 6 files changed, 178 insertions(+), 14 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx new file mode 100644 index 0000000..6110ef1 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx @@ -0,0 +1,50 @@ +<!-- + #%L + ObServe :: Swing + %% + Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<JPanel id="beanTreeHeader" + layout='{new BorderLayout()}'> + + <BeanTreeHeaderHandler id='handler' constructorParams='this'/> + + <script><![CDATA[ + +void $afterCompleteSetup() { + getHandler().initUI(); +} + +]]> + </script> + + <JLabel id="label" constraints='BorderLayout.CENTER'/> + + <JToolBar id='toolbar' constraints='BorderLayout.EAST'> + + <!-- les boutons pour grouper/déplier tout l'arbre --> + <JButton id='colapseAll'/> + <JButton id='expandAll'/> + + <!-- les boutons pour sélectionner/déselctionner tout l'arbre --> + <JButton id='selectAll'/> + <JButton id='deselectAll'/> + + </JToolBar> + +</JPanel> \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss new file mode 100644 index 0000000..8b8c11d --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss @@ -0,0 +1,67 @@ +/* + * #%L + * ObServe :: Swing + * %% + * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +#label { + opaque:false; + text:{""}; +} + +#toolbar { + floatable:false; + borderPainted:false; +} + +#colapseAll { + actionIcon:"combobox-reset"; + toolTipText:"observe.tree.action.collapseAll.tip"; + focusable:false; + focusPainted:false; + visible:{true}; + enabled:{true}; +} + +#expandAll { + actionIcon:"add"; + toolTipText:"observe.tree.action.expandAll.tip"; + focusable:false; + focusPainted:false; + visible:{true}; + enabled:{true}; +} + +#selectAll { + actionIcon:"add"; + toolTipText:"observe.tree.action.selectAll.tip"; + focusable:false; + focusPainted:false; + visible:{true}; + enabled:{true}; +} + +#deselectAll { + actionIcon:"combobox-reset"; + toolTipText:"observe.tree.action.deselectAll.tip"; + focusable:false; + focusPainted:false; + visible:{true}; + enabled:{true}; +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeaderHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeaderHandler.java new file mode 100644 index 0000000..e9d09a4 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeaderHandler.java @@ -0,0 +1,45 @@ +package fr.ird.observe.ui.util.tree; + +/* + * #%L + * ObServe :: Swing + * %% + * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * @author Samuel Maisonneuve- maisonneuve@codelutin.com + */ +public class BeanTreeHeaderHandler { + + private static final Log log = LogFactory.getLog(BeanTreeHeaderHandler.class); + + private final BeanTreeHeader ui; + + public BeanTreeHeaderHandler(BeanTreeHeader ui) { + this.ui = ui; + } + + public void initUI() { + + } + +} diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index ddda428..bd5b92d 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -350,6 +350,7 @@ observe.admin.resume.operation.failed= observe.admin.resume.operation.need.fix= observe.admin.resume.operation.not.started= observe.admin.resume.operation.running= +observe.application.config=ObServe Configuration observe.catchAcquisitionModeEnum.GROUPED=Batch observe.catchAcquisitionModeEnum.INDIVIDUAL=Individual observe.choice.cancel=Cancel @@ -612,7 +613,6 @@ observe.config.map.layer7.description= observe.config.map.layer8.description= observe.config.map.layer9.description= observe.config.map.style.description= -observe.config.name= observe.config.observation.activitysDetaillees= observe.config.observation.fauneAssociee= observe.config.observation.floatingObject= @@ -649,6 +649,7 @@ observe.config.ui.showNumberEditorButton=Flag sets to true to show button to inv observe.config.ui.showTimeEditorSlider=Show timer slider observe.config.ui.storeRemoteStorage=Flag sets to true to store in config a remote connexion (except passwords) observe.config.ui.treeOpenNodes= +observe.configuration.description= observe.content.action.activity=Create a new activity observe.content.action.activity.tip=Create a new activity observe.content.action.baitHaulingStatus.create.tip= @@ -2126,10 +2127,10 @@ observe.title.storage.info=Storage details observe.title.technical.informations=Technical information of %1$s observe.title.unique.key=Unique keys used in a referentiel observe.title.welcome.admin=Observe Admin -observe.tree.action.collapseAll.tip= -observe.tree.action.expandAll.tip= -observe.tree.action.selectAll.tip= -observe.tree.action.unselectAll.tip= +observe.tree.action.collapseAll.tip=Collapse all +observe.tree.action.deselectAll.tip=Deselect All +observe.tree.action.expandAll.tip=Expand all +observe.tree.action.selectAll.tip=Select All observe.tree.activityLongline=Activity observe.tree.activityLongline.unsaved=New activity observe.tree.activitySeine=Activity diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index d5c9503..d28ec1a 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -350,6 +350,7 @@ observe.admin.resume.operation.failed=la operación no realizada observe.admin.resume.operation.need.fix=la operación nesista correcciones observe.admin.resume.operation.not.started=operación no empezada observe.admin.resume.operation.running=operación en curso... +observe.config.name=Configuración de ObServe observe.catchAcquisitionModeEnum.GROUPED= observe.catchAcquisitionModeEnum.INDIVIDUAL= observe.choice.cancel=Cancelar @@ -612,7 +613,6 @@ observe.config.map.layer7.description= observe.config.map.layer8.description= observe.config.map.layer9.description= observe.config.map.style.description= -observe.config.name= observe.config.observation.activitysDetaillees=Observación de actividades detalladas observe.config.observation.fauneAssociee=Observación de Fauna asociada observe.config.observation.floatingObject=Observación de objetos flotantes @@ -649,6 +649,7 @@ observe.config.ui.showNumberEditorButton=Para mostrar el botón que permite usar observe.config.ui.showTimeEditorSlider= observe.config.ui.storeRemoteStorage=Para activar la copia de seguridad de la configuración del origen de datos remota observe.config.ui.treeOpenNodes= +observe.configuration.description= observe.content.action.activity=Crear una nueva actividad observe.content.action.activity.tip=Crear una nueva actividad para la ruta actual observe.content.action.baitHaulingStatus.create.tip= @@ -2126,10 +2127,10 @@ observe.title.storage.info= observe.title.technical.informations= observe.title.unique.key= observe.title.welcome.admin= -observe.tree.action.collapseAll.tip= -observe.tree.action.expandAll.tip= -observe.tree.action.selectAll.tip= -observe.tree.action.unselectAll.tip= +observe.tree.action.collapseAll.tip=Cerrar los nudos +observe.tree.action.deselectAll.tip=Deseleccionar todo +observe.tree.action.expandAll.tip=Abrir los nudos +observe.tree.action.selectAll.tip=Seleccionar todo observe.tree.activityLongline=Actividad observe.tree.activityLongline.unsaved=Nueva actividad observe.tree.activitySeine=Actividad diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index d9a98a5..26c2a39 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -2126,10 +2126,10 @@ observe.title.storage.info=Information sur la source de données observe.title.technical.informations=Informations techniques du référentiel %1$s observe.title.unique.key=Clefs métier du référentiel %1$s observe.title.welcome.admin=Observe Administrateur -observe.tree.action.collapseAll.tip= -observe.tree.action.expandAll.tip= -observe.tree.action.selectAll.tip= -observe.tree.action.unselectAll.tip= +observe.tree.action.collapseAll.tip=Tout grouper +observe.tree.action.deselectAll.tip=Tout désélectionner +observe.tree.action.expandAll.tip=Tout déplier +observe.tree.action.selectAll.tip=Tout sélectionner observe.tree.activityLongline=Activités observe.tree.activityLongline.unsaved=Nouvelle activité observe.tree.activitySeine=Activités -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553_ajoute_un_widget_pour_les_arbres in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit e2189537a1a40426a8b732cffa17e70af258ebe8 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Mon Aug 22 23:20:15 2016 +0200 Ajoute des icones sur les boutons du BeanTreeHeader refs #7553 --- .../src/main/filters/observe-ui.properties | 5 +++++ .../java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx | 2 +- .../java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss | 12 ++++++------ .../ird/observe/ui/util/tree/BeanTreeHeaderHandler.java | 6 +++--- .../i18n/observe-application-swing_en_GB.properties | 2 +- .../i18n/observe-application-swing_es_ES.properties | 2 +- .../i18n/observe-application-swing_fr_FR.properties | 2 +- .../src/main/resources/icons/action-collapse.png | Bin 0 -> 372 bytes .../src/main/resources/icons/action-expand.png | Bin 0 -> 371 bytes .../src/main/resources/icons/action-select.png | Bin 0 -> 392 bytes .../src/main/resources/icons/action-unselect.png | Bin 0 -> 311 bytes 11 files changed, 18 insertions(+), 13 deletions(-) diff --git a/observe-application-swing/src/main/filters/observe-ui.properties b/observe-application-swing/src/main/filters/observe-ui.properties index a6a3dbd..96e06b9 100644 --- a/observe-application-swing/src/main/filters/observe-ui.properties +++ b/observe-application-swing/src/main/filters/observe-ui.properties @@ -190,6 +190,11 @@ icon.action.generate=action-generate.png icon.action.insert-before=action-insert-before.png icon.action.insert-after=action-insert-after.png +icon.action.expand=action-expand.png +icon.action.collapse=action-collapse.png +icon.action.select=action-select.png +icon.action.unselect=action-unselect.png + icon.action.wizard-state-pending=action-wizard-state-pending-16.png icon.action.wizard-state-running=action-wizard-state-running-16.png icon.action.wizard-state-need_fix=action-wizard-state-need_fix-16.png diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx index 4cf27ed..4579ce1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx @@ -33,7 +33,7 @@ <!-- les boutons pour sélectionner/déselectionner tout l'arbre --> <JButton id='selectAll' onActionPerformed='handler.selectAll()'/> - <JButton id='deselectAll' onActionPerformed='handler.deselectAll()'/> + <JButton id='unselectAll' onActionPerformed='handler.unselectAll()'/> </JToolBar> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss index 8b8c11d..06d1a49 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss @@ -31,7 +31,7 @@ } #colapseAll { - actionIcon:"combobox-reset"; + actionIcon:"collapse"; toolTipText:"observe.tree.action.collapseAll.tip"; focusable:false; focusPainted:false; @@ -40,7 +40,7 @@ } #expandAll { - actionIcon:"add"; + actionIcon:"expand"; toolTipText:"observe.tree.action.expandAll.tip"; focusable:false; focusPainted:false; @@ -49,7 +49,7 @@ } #selectAll { - actionIcon:"add"; + actionIcon:"select"; toolTipText:"observe.tree.action.selectAll.tip"; focusable:false; focusPainted:false; @@ -57,9 +57,9 @@ enabled:{true}; } -#deselectAll { - actionIcon:"combobox-reset"; - toolTipText:"observe.tree.action.deselectAll.tip"; +#unselectAll { + actionIcon:"unselect"; + toolTipText:"observe.tree.action.unselectAll.tip"; focusable:false; focusPainted:false; visible:{true}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeaderHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeaderHandler.java index 5dc51b8..97016be 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeaderHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeaderHandler.java @@ -56,8 +56,8 @@ public class BeanTreeHeaderHandler implements UIHandler<BeanTreeHeader> { public void afterInit(BeanTreeHeader beanTreeHeader) {} public void collapseAll() { - // Let's deselect the nodes before collapsing them - deselectAll(); + // Let's unselect the nodes before collapsing them + unselectAll(); JTree tree = getTree(); for (int i = 0; i < tree.getRowCount(); i++) { @@ -88,7 +88,7 @@ public class BeanTreeHeaderHandler implements UIHandler<BeanTreeHeader> { } } - public void deselectAll() { + public void unselectAll() { JTree tree = getTree(); TreeSelectionModel selectionModel = tree.getSelectionModel(); diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index bd5b92d..836f6b9 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -2128,9 +2128,9 @@ observe.title.technical.informations=Technical information of %1$s observe.title.unique.key=Unique keys used in a referentiel observe.title.welcome.admin=Observe Admin observe.tree.action.collapseAll.tip=Collapse all -observe.tree.action.deselectAll.tip=Deselect All observe.tree.action.expandAll.tip=Expand all observe.tree.action.selectAll.tip=Select All +observe.tree.action.unselectAll.tip=Unselect All observe.tree.activityLongline=Activity observe.tree.activityLongline.unsaved=New activity observe.tree.activitySeine=Activity diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index d28ec1a..2b14faa 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -2128,9 +2128,9 @@ observe.title.technical.informations= observe.title.unique.key= observe.title.welcome.admin= observe.tree.action.collapseAll.tip=Cerrar los nudos -observe.tree.action.deselectAll.tip=Deseleccionar todo observe.tree.action.expandAll.tip=Abrir los nudos observe.tree.action.selectAll.tip=Seleccionar todo +observe.tree.action.unselectAll.tip=Deseleccionar todo observe.tree.activityLongline=Actividad observe.tree.activityLongline.unsaved=Nueva actividad observe.tree.activitySeine=Actividad diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 26c2a39..c13187a 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -2127,9 +2127,9 @@ observe.title.technical.informations=Informations techniques du référentiel %1 observe.title.unique.key=Clefs métier du référentiel %1$s observe.title.welcome.admin=Observe Administrateur observe.tree.action.collapseAll.tip=Tout grouper -observe.tree.action.deselectAll.tip=Tout désélectionner observe.tree.action.expandAll.tip=Tout déplier observe.tree.action.selectAll.tip=Tout sélectionner +observe.tree.action.unselectAll.tip=Tout désélectionner observe.tree.activityLongline=Activités observe.tree.activityLongline.unsaved=Nouvelle activité observe.tree.activitySeine=Activités diff --git a/observe-application-swing/src/main/resources/icons/action-collapse.png b/observe-application-swing/src/main/resources/icons/action-collapse.png new file mode 100644 index 0000000..f88a24a Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-collapse.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-expand.png b/observe-application-swing/src/main/resources/icons/action-expand.png new file mode 100644 index 0000000..3c19e48 Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-expand.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-select.png b/observe-application-swing/src/main/resources/icons/action-select.png new file mode 100644 index 0000000..bbee129 Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-select.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-unselect.png b/observe-application-swing/src/main/resources/icons/action-unselect.png new file mode 100644 index 0000000..3b49008 Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-unselect.png differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553_ajoute_un_widget_pour_les_arbres in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 9a9340e9613750a417d8586421bb7b073002b94d Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Tue Aug 23 10:14:52 2016 +0200 Configure le label du BeanTreeHeader avec un attibut de composant 'labelText' refs #7553 --- .../src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx | 4 ++++ .../src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx index 4579ce1..9419d8e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx @@ -21,8 +21,12 @@ --> <JPanel layout='{new BorderLayout()}'> + <!-- label --> + <String id='labelText' javaBean='null'/> + <!-- tree --> <JTree id='tree' javaBean='new JTree()'/> + <JLabel id="label" constraints='BorderLayout.CENTER'/> <JToolBar id='toolbar' constraints='BorderLayout.EAST'> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss index 06d1a49..3b253f6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss @@ -22,7 +22,7 @@ #label { opaque:false; - text:{""}; + text:{SwingUtil.getStringValue(getLabelText())}; } #toolbar { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553_ajoute_un_widget_pour_les_arbres in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 4f0fac5c5c0687fe88361183c98128580e016fee Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 12:32:24 2016 +0200 Optimize css --- .../ird/observe/ui/util/tree/BeanTreeHeader.jcss | 35 +++++++--------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss index 3b253f6..46d0bdf 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss @@ -21,47 +21,32 @@ */ #label { - opaque:false; - text:{SwingUtil.getStringValue(getLabelText())}; + text:{getLabelText()}; } -#toolbar { - floatable:false; - borderPainted:false; +JButton { + focusable:false; + focusPainted:false; + visible:true; + enabled:true; } #colapseAll { - actionIcon:"collapse"; + actionIcon:collapse; toolTipText:"observe.tree.action.collapseAll.tip"; - focusable:false; - focusPainted:false; - visible:{true}; - enabled:{true}; } #expandAll { - actionIcon:"expand"; + actionIcon:expand; toolTipText:"observe.tree.action.expandAll.tip"; - focusable:false; - focusPainted:false; - visible:{true}; - enabled:{true}; } #selectAll { - actionIcon:"select"; + actionIcon:select; toolTipText:"observe.tree.action.selectAll.tip"; - focusable:false; - focusPainted:false; - visible:{true}; - enabled:{true}; } #unselectAll { - actionIcon:"unselect"; + actionIcon:unselect; toolTipText:"observe.tree.action.unselectAll.tip"; - focusable:false; - focusPainted:false; - visible:{true}; - enabled:{true}; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553_ajoute_un_widget_pour_les_arbres in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 20fc7d9da88d77bf7398a2e69fc68647ef2b13c5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 12:55:38 2016 +0200 Rename tree header id --- .../src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx index cfe9a52..ab0da89 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx @@ -78,12 +78,12 @@ public void destroy() { <JPanel id='PENDING_content'> <JScrollPane id='selectTreePane' constraints='BorderLayout.CENTER' - decorator='boxed' columnHeaderView='{treeHeader}'> + decorator='boxed' columnHeaderView='{selectTreeHeader}'> <!-- arbre de selection des exports --> <JTree id='selectTree'/> - <BeanTreeHeader id='treeHeader' tree='{selectTree}'/> + <BeanTreeHeader id='selectTreeHeader' tree='{selectTree}'/> </JScrollPane> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.