Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5817a5df by Tony CHEMIT at 2017-08-19T11:40:46+00:00 Permettre l'utilisation de la molette de la souris même sur des zones protégées (See #854) - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ui/admin/AdminUI.jaxx - − client/src/main/java/fr/ird/observe/client/ui/admin/AdminUIBlockingLayerUI.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/AdminUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/AdminUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/AdminUI.jaxx @@ -25,9 +25,9 @@ <import> fr.ird.observe.client.ui.util.UIHelper + fr.ird.observe.client.ui.util.ObserveBlockingLayerUI org.nuiton.jaxx.runtime.JAXXContext - org.nuiton.jaxx.runtime.swing.BlockingLayerUI org.nuiton.jaxx.runtime.swing.wizard.ext.WizardExtUI org.nuiton.jaxx.runtime.swing.wizard.ext.WizardExtUtil org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState @@ -40,16 +40,16 @@ <AdminUIModel id='model' initializer='getContextValue(AdminUIModel.class)'/> <!-- le bloqueur d'ui utilisé par l'assistant --> - <AdminUIBlockingLayerUI id='tabBusyBlockLayerUI' constructorParams="this"/> + <ObserveBlockingLayerUI id='tabBusyBlockLayerUI'/> <!-- le bloqueur d'ui lorsqu'une action est en cours ou annulée --> - <AdminUIBlockingLayerUI id='busyBlockLayerUI' constructorParams="this"/> + <ObserveBlockingLayerUI id='busyBlockLayerUI'/> <!-- le bloqueur de changement d'opérations --> - <AdminUIBlockingLayerUI id='operationBlockLayerUI' constructorParams="this"/> + <ObserveBlockingLayerUI id='operationBlockLayerUI'/> <!-- le bloqueur de changement de configuration --> - <AdminUIBlockingLayerUI id='configBlockLayerUI' constructorParams="this"/> + <ObserveBlockingLayerUI id='configBlockLayerUI'/> <script><![CDATA[ ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/AdminUIBlockingLayerUI.java deleted ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/AdminUIBlockingLayerUI.java +++ /dev/null @@ -1,41 +0,0 @@ -package fr.ird.observe.client.ui.admin; - -/*- - * #%L - * ObServe :: Client - * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io - * %% - * 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 fr.ird.observe.client.ui.util.ObserveBlockingLayerUI; - -/** - * Created on 09/11/16. - * - * @author Tony Chemit - dev@tchemit.fr - * @since 6.0 - */ -class AdminUIBlockingLayerUI extends ObserveBlockingLayerUI { - - private final AdminUI ui; - - AdminUIBlockingLayerUI(AdminUI ui) { - this.ui = ui; - } - -} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5817a5df8cc9275b38848f0b9124... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5817a5df8cc9275b38848f0b9124... You're receiving this email because of your account on gitlab.com.