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

Commits:

8 changed files:

Changes:

  • client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx
    ... ... @@ -80,10 +80,10 @@
    80 80 
         fr.ird.observe.client.ui.tree.navigation.NavigationTree
    81 81 
         fr.ird.observe.client.ui.tree.navigation.NavigationTreeHeader
    82 82 
         fr.ird.observe.client.ui.util.UIHelper
    83 
    +    fr.ird.observe.client.ui.util.ObserveBlockingLayerUI
    83 84
    84 85 
         org.nuiton.jaxx.runtime.swing.CardLayout2
    85 86 
         org.nuiton.jaxx.runtime.swing.CardLayout2Ext
    86 
    -    org.nuiton.jaxx.runtime.swing.BlockingLayerUI
    87 87 
         org.nuiton.jaxx.widgets.status.StatusMessagePanel
    88 88 
         org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel
    89 89
    ... ... @@ -126,7 +126,7 @@
    126 126
    127 127 
       <CardLayout2Ext id='bodyLayout' constructorParams='this, "body"'/>
    128 128
    129 
    -  <BlockingLayerUI id='busyBlockLayerUI'/>
    129 
    +  <ObserveBlockingLayerUI id='busyBlockLayerUI'/>
    130 130
    131 131 
       <script><![CDATA[
    132 132

  • client/src/main/java/fr/ird/observe/client/ui/admin/AdminUI.jaxx
    ... ... @@ -40,16 +40,16 @@
    40 40 
       <AdminUIModel id='model' initializer='getContextValue(AdminUIModel.class)'/>
    41 41
    42 42 
       <!-- le bloqueur d'ui utilisé par l'assistant -->
    43 
    -  <BlockingLayerUI id='tabBusyBlockLayerUI'/>
    43 
    +  <AdminUIBlockingLayerUI id='tabBusyBlockLayerUI' constructorParams="this"/>
    44 44
    45 45 
       <!-- le bloqueur d'ui lorsqu'une action est en cours ou annulée -->
    46 
    -  <BlockingLayerUI id='busyBlockLayerUI'/>
    46 
    +  <AdminUIBlockingLayerUI id='busyBlockLayerUI' constructorParams="this"/>
    47 47
    48 48 
       <!-- le bloqueur de changement d'opérations -->
    49 
    -  <BlockingLayerUI id='operationBlockLayerUI'/>
    49 
    +  <AdminUIBlockingLayerUI id='operationBlockLayerUI' constructorParams="this"/>
    50 50
    51 51 
       <!-- le bloqueur de changement de configuration -->
    52 
    -  <BlockingLayerUI id='configBlockLayerUI'/>
    52 
    +  <AdminUIBlockingLayerUI id='configBlockLayerUI' constructorParams="this"/>
    53 53
    54 54 
       <script><![CDATA[
    55 55

  • client/src/main/java/fr/ird/observe/client/ui/admin/AdminUIBlockingLayerUI.java
    1 
    +package fr.ird.observe.client.ui.admin;
    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 
    +
    25 
    +import fr.ird.observe.client.ui.util.ObserveBlockingLayerUI;
    26 
    +
    27 
    +/**
    28 
    + * Created on 09/11/16.
    29 
    + *
    30 
    + * @author Tony Chemit - dev@tchemit.fr
    31 
    + * @since 6.0
    32 
    + */
    33 
    +class AdminUIBlockingLayerUI extends ObserveBlockingLayerUI {
    34 
    +
    35 
    +    private final AdminUI ui;
    36 
    +
    37 
    +    AdminUIBlockingLayerUI(AdminUI ui) {
    38 
    +        this.ui = ui;
    39 
    +    }
    40 
    +
    41 
    +}

  • client/src/main/java/fr/ird/observe/client/ui/content/ContentUI.jaxx
    ... ... @@ -46,7 +46,6 @@
    46 46
    47 47 
         org.jdesktop.jxlayer.JXLayer
    48 48
    49 
    -    org.nuiton.jaxx.runtime.swing.BlockingLayerUI
    50 49 
         org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel
    51 50
    52 51 
         javax.swing.JComboBox

  • client/src/main/java/fr/ird/observe/client/ui/content/ContentUIBlockingLayerUI.java
    ... ... @@ -25,6 +25,7 @@ package fr.ird.observe.client.ui.content;
    25 25 
     import com.google.common.collect.ImmutableSet;
    26 26 
     import fr.ird.observe.client.ObserveSwingApplicationContext;
    27 27 
     import fr.ird.observe.client.ui.actions.UIActionSupport;
    28 
    +import fr.ird.observe.client.ui.util.ObserveBlockingLayerUI;
    28 29 
     import java.awt.event.ActionEvent;
    29 30 
     import java.awt.event.KeyEvent;
    30 31 
     import java.awt.event.MouseEvent;
    ... ... @@ -38,7 +39,6 @@ import javax.swing.SwingUtilities;
    38 39 
     import org.apache.commons.logging.Log;
    39 40 
     import org.apache.commons.logging.LogFactory;
    40 41 
     import org.jdesktop.jxlayer.JXLayer;
    41 
    -import org.nuiton.jaxx.runtime.swing.BlockingLayerUI;
    42 42
    43 43 
     /**
    44 44 
      * Created on 09/11/16.
    ... ... @@ -46,7 +46,7 @@ import org.nuiton.jaxx.runtime.swing.BlockingLayerUI;
    46 46 
      * @author Tony Chemit - dev@tchemit.fr
    47 47 
      * @since 6.0
    48 48 
      */
    49 
    -public class ContentUIBlockingLayerUI extends BlockingLayerUI {
    49 
    +public class ContentUIBlockingLayerUI extends ObserveBlockingLayerUI {
    50 50
    51 51 
         /** Logger */
    52 52 
         private static final Log log = LogFactory.getLog(ContentUIBlockingLayerUI.class);
    ... ... @@ -68,7 +68,7 @@ public class ContentUIBlockingLayerUI extends BlockingLayerUI {
    68 68
    69 69 
         private final ContentUI ui;
    70 70
    71 
    -    public ContentUIBlockingLayerUI(ContentUI ui) {
    71 
    +    ContentUIBlockingLayerUI(ContentUI ui) {
    72 72 
             this.ui = ui;
    73 73 
         }
    74 74

  • client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUI.jaxx
    ... ... @@ -37,8 +37,8 @@
    37 37 
         fr.ird.observe.client.ui.actions.main.global.NewNextDataGlobalUIAction
    38 38 
         fr.ird.observe.client.ui.actions.main.global.ResetDataGlobalUIAction
    39 39 
         fr.ird.observe.client.ui.actions.main.global.SaveDataGlobalUIAction
    40 
    +    fr.ird.observe.client.ui.util.ObserveBlockingLayerUI
    40 41
    41 
    -    org.nuiton.jaxx.runtime.swing.BlockingLayerUI
    42 42 
         org.nuiton.jaxx.validator.swing.SwingValidator
    43 43
    44 44 
         fr.ird.observe.services.dto.AbstractObserveDto
    ... ... @@ -78,7 +78,7 @@
    78 78 
                           onValueChanged='getHandler().updateEditor(event)'/>
    79 79
    80 80 
       <!-- le bloqueur de l'editeur d'une entrée du tableau -->
    81 
    -  <BlockingLayerUI id='editorBlockLayerUI'/>
    81 
    +  <ObserveBlockingLayerUI id='editorBlockLayerUI'/>
    82 82
    83 83 
       <IdDto id='tableEditBean' initializer='getModel().getTableEditBean()'/>
    84 84

  • client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIBlockingLayerUI.java
    ... ... @@ -25,6 +25,7 @@ package fr.ird.observe.client.ui.storage;
    25 25 
     import com.google.common.collect.ImmutableSet;
    26 26 
     import fr.ird.observe.client.ObserveSwingApplicationContext;
    27 27 
     import fr.ird.observe.client.ui.actions.UIActionSupport;
    28 
    +import fr.ird.observe.client.ui.util.ObserveBlockingLayerUI;
    28 29 
     import java.awt.event.ActionEvent;
    29 30 
     import java.awt.event.KeyEvent;
    30 31 
     import java.awt.event.MouseEvent;
    ... ... @@ -38,7 +39,6 @@ import javax.swing.SwingUtilities;
    38 39 
     import org.apache.commons.logging.Log;
    39 40 
     import org.apache.commons.logging.LogFactory;
    40 41 
     import org.jdesktop.jxlayer.JXLayer;
    41 
    -import org.nuiton.jaxx.runtime.swing.BlockingLayerUI;
    42 42
    43 43 
     /**
    44 44 
      * Created on 09/11/16.
    ... ... @@ -46,7 +46,7 @@ import org.nuiton.jaxx.runtime.swing.BlockingLayerUI;
    46 46 
      * @author Tony Chemit - dev@tchemit.fr
    47 47 
      * @since 6.0
    48 48 
      */
    49 
    -public class StorageUIBlockingLayerUI extends BlockingLayerUI {
    49 
    +public class StorageUIBlockingLayerUI extends ObserveBlockingLayerUI {
    50 50
    51 51 
         /** Logger */
    52 52 
         private static final Log log = LogFactory.getLog(StorageUIBlockingLayerUI.class);

  • client/src/main/java/fr/ird/observe/client/ui/util/ObserveBlockingLayerUI.java
    1 
    +package fr.ird.observe.client.ui.util;
    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 
    +
    25 
    +import com.google.common.collect.ImmutableSet;
    26 
    +import fr.ird.observe.client.ObserveSwingApplicationContext;
    27 
    +import fr.ird.observe.client.ui.actions.UIActionSupport;
    28 
    +import java.awt.event.ActionEvent;
    29 
    +import java.awt.event.KeyEvent;
    30 
    +import java.awt.event.MouseEvent;
    31 
    +import java.awt.event.MouseWheelEvent;
    32 
    +import java.util.Set;
    33 
    +import javax.swing.Action;
    34 
    +import javax.swing.ActionMap;
    35 
    +import javax.swing.InputMap;
    36 
    +import javax.swing.JComponent;
    37 
    +import javax.swing.KeyStroke;
    38 
    +import javax.swing.SwingUtilities;
    39 
    +import org.apache.commons.logging.Log;
    40 
    +import org.apache.commons.logging.LogFactory;
    41 
    +import org.jdesktop.jxlayer.JXLayer;
    42 
    +import org.nuiton.jaxx.runtime.swing.BlockingLayerUI;
    43 
    +
    44 
    +/**
    45 
    + * Created on 09/11/16.
    46 
    + *
    47 
    + * @author Tony Chemit - dev@tchemit.fr
    48 
    + * @since 6.0
    49 
    + */
    50 
    +public class ObserveBlockingLayerUI extends BlockingLayerUI {
    51 
    +
    52 
    +    @Override
    53 
    +    protected final void processMouseWheelEvent(MouseWheelEvent e, JXLayer<? extends JComponent> l) {
    54 
    +        // never block that type of events
    55 
    +    }
    56 
    +
    57 
    +}

    • —
    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.