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

Commits:

2 changed files:

Changes:

  • client/src/main/java/fr/ird/observe/client/ui/admin/AdminUI.jaxx
    ... ... @@ -25,9 +25,9 @@
    25 25
     
    
    26 26
       <import>
    
    27 27
         fr.ird.observe.client.ui.util.UIHelper
    
    28
    +    fr.ird.observe.client.ui.util.ObserveBlockingLayerUI
    
    28 29
     
    
    29 30
         org.nuiton.jaxx.runtime.JAXXContext
    
    30
    -    org.nuiton.jaxx.runtime.swing.BlockingLayerUI
    
    31 31
         org.nuiton.jaxx.runtime.swing.wizard.ext.WizardExtUI
    
    32 32
         org.nuiton.jaxx.runtime.swing.wizard.ext.WizardExtUtil
    
    33 33
         org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState
    
    ... ... @@ -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
    -  <AdminUIBlockingLayerUI id='tabBusyBlockLayerUI' constructorParams="this"/>
    
    43
    +  <ObserveBlockingLayerUI id='tabBusyBlockLayerUI'/>
    
    44 44
     
    
    45 45
       <!-- le bloqueur d'ui lorsqu'une action est en cours ou annulée -->
    
    46
    -  <AdminUIBlockingLayerUI id='busyBlockLayerUI' constructorParams="this"/>
    
    46
    +  <ObserveBlockingLayerUI id='busyBlockLayerUI'/>
    
    47 47
     
    
    48 48
       <!-- le bloqueur de changement d'opérations -->
    
    49
    -  <AdminUIBlockingLayerUI id='operationBlockLayerUI' constructorParams="this"/>
    
    49
    +  <ObserveBlockingLayerUI id='operationBlockLayerUI'/>
    
    50 50
     
    
    51 51
       <!-- le bloqueur de changement de configuration -->
    
    52
    -  <AdminUIBlockingLayerUI id='configBlockLayerUI' constructorParams="this"/>
    
    52
    +  <ObserveBlockingLayerUI id='configBlockLayerUI'/>
    
    53 53
     
    
    54 54
       <script><![CDATA[
    
    55 55
     
    

  • client/src/main/java/fr/ird/observe/client/ui/admin/AdminUIBlockingLayerUI.java deleted
    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
    -}