Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

5 changed files:

Changes:

  • client-configuration/pom.xml
    ... ... @@ -59,10 +59,6 @@
    59 59 
         </dependency>
    60 60 
         <dependency>
    61 61 
           <groupId>fr.ird.observe.toolkit</groupId>
    62 
    -      <artifactId>common-service</artifactId>
    63 
    -    </dependency>
    64 
    -    <dependency>
    65 
    -      <groupId>fr.ird.observe.toolkit</groupId>
    66 62 
           <artifactId>common-client</artifactId>
    67 63 
         </dependency>
    68 64

  • client/pom.xml
    ... ... @@ -402,10 +402,6 @@
    402 402
    403 403 
         <dependency>
    404 404 
           <groupId>io.ultreia.java4all</groupId>
    405 
    -      <artifactId>class-mapping</artifactId>
    406 
    -    </dependency>
    407 
    -    <dependency>
    408 
    -      <groupId>io.ultreia.java4all</groupId>
    409 405 
           <artifactId>java-lang</artifactId>
    410 406 
         </dependency>
    411 407
    ... ... @@ -506,10 +502,6 @@
    506 502 
           <groupId>com.google.guava</groupId>
    507 503 
           <artifactId>guava</artifactId>
    508 504 
         </dependency>
    509 
    -    <dependency>
    510 
    -      <groupId>com.google.code.gson</groupId>
    511 
    -      <artifactId>gson</artifactId>
    512 
    -    </dependency>
    513 505
    514 506 
         <!-- Nuiton -->
    515 507 
         <dependency>

  • client/src/main/java/fr/ird/observe/client/ObserveMainUIInitializer.java
    ... ... @@ -200,10 +200,6 @@ public class ObserveMainUIInitializer {
    200 200
    201 201 
             ui.getStatus().init();
    202 202
    203 
    -//        // ajout d'un ecouteur sur la navigation pour toujours mettre la scrollbar
    204 
    -//        // tout à droite a chaque selection
    205 
    -//        ui.getNavigation().addTreeSelectionListener(this::changeNavigationNode);
    206 
    -
    207 203 
             // installation layer de blocage en mode busy
    208 204 
             UIHelper.setLayerUI(ui.getBody(), ui.getBusyBlockLayerUI());
    209 205
    ... ... @@ -212,59 +208,6 @@ public class ObserveMainUIInitializer {
    212 208 
                 boolean newvalue = (boolean) evt.getNewValue();
    213 209 
                 updateBusyState(newvalue);
    214 210 
             });
    215 
    -
    216 
    -//        ui.getModel().addPropertyChangeListener("focusOnNavigation", evt -> {
    217 
    -//            boolean newvalue = (boolean) evt.getNewValue();
    218 
    -//            updateFocusOnNavigation(newvalue);
    219 
    -//        });
    220 
    -
    221 
    -//        MouseAdapter mouseAdapter = new MouseAdapter() {
    222 
    -//            @Override
    223 
    -//            public void mouseEntered(MouseEvent e) {
    224 
    -//                if (log.isDebugEnabled()) {
    225 
    -//                    log.debug("Enter in navigation zone: " + e);
    226 
    -//                }
    227 
    -//                ui.getModel().setFocusOnNavigation(true);
    228 
    -//            }
    229 
    -//        };
    230 
    -//        ui.getNavigationView().addMouseListener(mouseAdapter);
    231 
    -//        ui.getNavigation().addMouseListener(mouseAdapter);
    232 
    -//        ui.getNavigationTreeHeader().addMouseListener(mouseAdapter);
    233 
    -//
    234 
    -//        new JSplitPaneInitializer<>().init(null, ui.getModeDb());
    235 
    -//        new JTreeInitializer<>().init(null, ui.getNavigation());
    236 
    -//
    237 
    -//        ui.getNavigationView().setRightDecoration(ui.getNavigationTreeHeader().getToolbar());
    238 
    -//        ui.getNavigationView().addComponentListener(new ComponentAdapter() {
    239 
    -//
    240 
    -//            @Override
    241 
    -//            public void componentResized(ComponentEvent e) {
    242 
    -//
    243 
    -//                JComponent source = (JComponent) e.getSource();
    244 
    -//
    245 
    -//                NavigationTreeHeader actions = ui.getNavigationTreeHeader();
    246 
    -//
    247 
    -//                Dimension preferredLayoutSize = actions.getLayout().preferredLayoutSize(actions);
    248 
    -//
    249 
    -//                Dimension showLonglineSize = actions.getShowLongline().getSize();
    250 
    -//                Dimension showSeineSize = actions.getShowSeine().getSize();
    251 
    -//                Dimension showReferential = actions.getShowReferential().getSize();
    252 
    -//                Dimension showEmpty = actions.getShowEmptyProgram().getSize();
    253 
    -//                int minWidth = 18 + (int) Math.max(showLonglineSize.getWidth() + showSeineSize.getWidth(), showReferential.getWidth() + showEmpty.getWidth());
    254 
    -//                source.setMinimumSize(new Dimension(minWidth, (int) source.getSize().getHeight()));
    255 
    -//                log.debug("Header resize to minimum: " + source.getMinimumSize());
    256 
    -//
    257 
    -//                int maxWidth = ui.getNavigationView().getWidth() - 10;
    258 
    -//
    259 
    -//                int currentWidth = (int) preferredLayoutSize.getWidth();
    260 
    -//                int height = 32;
    261 
    -//                if (currentWidth > maxWidth) {
    262 
    -//                    height += 32;
    263 
    -//                }
    264 
    -//                actions.setPreferredSize(new Dimension(maxWidth, height));
    265 
    -//
    266 
    -//            }
    267 
    -//        });
    268 211 
         }
    269 212
    270 213 
         protected void init(ObserveActionMap actionMap, AbstractButton editor) {

  • client/src/main/java/fr/ird/observe/client/spi/context/ObserveClientImplementationFactory.java
    1 1 
     package fr.ird.observe.client.spi.context;
    2 2
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe :: Client
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    3 25 
     import fr.ird.observe.client.ObserveMainUI;
    4 26 
     import fr.ird.observe.client.db.ObserveClientDataSource;
    5 27 
     import fr.ird.observe.client.db.ObserveClientDataSourcesManager;

  • services/src/main/java/fr/ird/observe/services/service/referential/SpeciesService.java
    1 1 
     package fr.ird.observe.services.service.referential;
    2 2
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe :: Services API
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    3 25 
     import com.google.common.collect.ImmutableSet;
    4 26 
     import fr.ird.observe.dto.referential.SpeciesDto;
    5 27 
     import fr.ird.observe.dto.referential.SpeciesGroupDto;

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.