Author: tchemit Date: 2013-03-12 14:12:49 +0100 (Tue, 12 Mar 2013) New Revision: 586 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/586 Log: - add long action to reload application - improve change locale action - fix reloading application code - add missing svn properties + license headers Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeLocaleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleFRAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleUKAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-03-12 13:12:49 UTC (rev 586) @@ -10,15 +10,15 @@ * %% * 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 + * 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 + * + * 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% Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-03-12 13:12:49 UTC (rev 586) @@ -40,6 +40,7 @@ tutti.property.zone= tutti.property.zoneLabel= tutti.propety.no.species.refTaxCode= +tutti.propety.no.species.speciesCode= tutti.propety.no.species.surveyCode= tutti.propety.no.vessel.name= tutti.propety.no.zone= Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-03-12 13:12:49 UTC (rev 586) @@ -1,3 +1,26 @@ +### +# #%L +# Tutti :: UI +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 - 2013 Ifremer +# %% +# 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% +### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo #Tue Mar 12 10:47:25 CET 2013 tuttihelp.createSpeciesBatch.action.addSpecies.help= Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-03-12 13:12:49 UTC (rev 586) @@ -623,6 +623,7 @@ cruiseId = null; protocolId = null; validationContext = null; + IOUtils.closeQuietly(dataContext); setScreen(null); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java 2013-03-12 13:12:49 UTC (rev 586) @@ -27,6 +27,9 @@ import fr.ifremer.tutti.service.config.TuttiServiceConfigOption; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.MainUI; +import fr.ifremer.tutti.ui.swing.content.MainUIHandler; +import fr.ifremer.tutti.ui.swing.content.ReloadTuttiAction; +import fr.ifremer.tutti.ui.swing.util.action.TuttiUIAction; import fr.ifremer.tutti.ui.swing.util.editor.VesselTableCell; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.config.ConfigUI; @@ -143,13 +146,17 @@ ConfigUI configUI = helper.buildUI( mainUI, n_("tutti.config.category.applications")); - + helper.displayUI(mainUI, false); mainUI.getHandler().getContext().getSwingSession().add(configUI); } protected void reloadApplication() { - mainUI.getHandler().reloadTutti(); + MainUIHandler handler = mainUI.getHandler(); + + TuttiUIAction<ReloadTuttiAction> action = + handler.createUIAction(null, ReloadTuttiAction.class); + action.actionPerformed(null); } protected void reloadUI() { Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeLocaleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeLocaleAction.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeLocaleAction.java 2013-03-12 13:12:49 UTC (rev 586) @@ -0,0 +1,51 @@ +package fr.ifremer.tutti.ui.swing.content; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * 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.ifremer.tutti.ui.swing.TuttiScreen; + +import java.util.Locale; + +/** + * TODO + * + * @author tchemit <chemit@codelutin.com> + * @since 1.0.3 + */ +public abstract class AbstractChangeLocaleAction extends AbstractChangeScreenAction { + + + protected AbstractChangeLocaleAction(MainUIHandler handler) { + super(handler, true, null); + } + + protected abstract Locale getLocale(); + + @Override + protected void doAction() throws Exception { + + getHandler().changeLocale(getLocale()); + } +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeLocaleAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleFRAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleFRAction.java 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleFRAction.java 2013-03-12 13:12:49 UTC (rev 586) @@ -30,16 +30,15 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0.3 */ -public class ChangeToLocaleFRAction extends AbstractMainUITuttiAction { +public class ChangeToLocaleFRAction extends AbstractChangeLocaleAction { public ChangeToLocaleFRAction(MainUIHandler handler) { - super(handler, true); + super(handler); } @Override - protected void doAction() throws Exception { - - getHandler().changeLocale(Locale.FRANCE); + protected Locale getLocale() { + return Locale.FRANCE; } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleUKAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleUKAction.java 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleUKAction.java 2013-03-12 13:12:49 UTC (rev 586) @@ -30,16 +30,14 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0.3 */ -public class ChangeToLocaleUKAction extends AbstractMainUITuttiAction { +public class ChangeToLocaleUKAction extends AbstractChangeLocaleAction { public ChangeToLocaleUKAction(MainUIHandler handler) { - super(handler, true); + super(handler); } @Override - protected void doAction() throws Exception { - - getHandler().changeLocale(Locale.UK); + protected Locale getLocale() { + return Locale.UK; } - } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-03-12 13:12:49 UTC (rev 586) @@ -202,7 +202,6 @@ // go to manage db screen (to install db) context.setScreen(TuttiScreen.MANAGE_DB); } - } } @@ -228,14 +227,6 @@ //-- Public methods --// //------------------------------------------------------------------------// - public void reloadTutti() { - - // Close the application - RunTutti.closeTutti(ui, false); - - RunTutti.startTutti(context, true); - } - public void reloadUI() { //close ui Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java 2013-03-12 13:12:49 UTC (rev 586) @@ -0,0 +1,54 @@ +package fr.ifremer.tutti.ui.swing.content; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * 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.ifremer.tutti.ui.swing.RunTutti; + +import static org.nuiton.i18n.I18n._; + +/** + * To reload Tutti application. + * + * @author tchemit <chemit@codelutin.com> + * @since 1.0.3 + */ +public class ReloadTuttiAction extends AbstractChangeScreenAction { + + public ReloadTuttiAction(MainUIHandler handler) { + super(handler, true, null); + setActionDescription(_("tutti.action.reloadTutti")); + } + + @Override + protected void doAction() throws Exception { + + // Close the application + RunTutti.closeTutti(getUI(), false); + + // Restart + RunTutti.startTutti(getContext(), true); + } + +} \ No newline at end of file Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-12 13:12:49 UTC (rev 586) @@ -396,7 +396,7 @@ abstractButton.setAction(action); } - protected <A extends AbstractTuttiAction> TuttiUIAction<A> createUIAction(AbstractButton abstractButton, + public <A extends AbstractTuttiAction> TuttiUIAction<A> createUIAction(AbstractButton abstractButton, Class<A> actionName) { try { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUI.css 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUI.css 2013-03-12 13:12:49 UTC (rev 586) @@ -21,6 +21,13 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ + +#busyBlockLayerUI { + useIcon:false; + blockingColor: {handler.getConfig().getColorBlockingLayer()}; + block:{true}; +} + #globalPanel { border: {new TitledBorder((String) null)}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUI.jaxx 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUI.jaxx 2013-03-12 13:12:49 UTC (rev 586) @@ -21,7 +21,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog layout='{new BorderLayout()}' width='300' height='200' modal='true' +<JDialog width='300' height='200' modal='true' undecorated='true' implements='fr.ifremer.tutti.ui.swing.util.TuttiUI<TuttiActionUIModel, TuttiActionUIHandler>'> <import> @@ -29,6 +29,8 @@ fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.TuttiUIContext + jaxx.runtime.swing.BlockingLayerUI + javax.swing.border.EmptyBorder static org.nuiton.i18n.I18n._ @@ -56,23 +58,29 @@ } ]]></script> + + <BlockingLayerUI id='busyBlockLayerUI'/> + <TuttiActionUIHandler id='handler' initializer='getContextValue(TuttiActionUIHandler.class)'/> <TuttiActionUIModel id='model' initializer='getContextValue(TuttiActionUIModel.class)'/> + <JPanel id='rootPanel' layout='{new BorderLayout()}' + constraints='BorderLayout.CENTER' decorator='boxed'> + <JPanel id='globalPanel' constraints='BorderLayout.NORTH' + layout='{new BorderLayout()}'> + <JLabel id='globalActionLabel' constraints='BorderLayout.CENTER'/> + <JProgressBar id='globalProgressBar' constraints='BorderLayout.SOUTH'/> + </JPanel> + <JPanel id='taskPanel' constraints='BorderLayout.CENTER' + layout='{new BorderLayout()}'> + <JLabel id='taskActionLabel' constraints='BorderLayout.CENTER'/> + <JProgressBar id='taskProgressBar' constraints='BorderLayout.SOUTH'/> + </JPanel> + </JPanel> - <JPanel id='globalPanel' constraints='BorderLayout.NORTH' - layout='{new BorderLayout()}'> - <JLabel id='globalActionLabel' constraints='BorderLayout.CENTER'/> - <JProgressBar id='globalProgressBar' constraints='BorderLayout.SOUTH'/> - </JPanel> - <JPanel id='taskPanel' constraints='BorderLayout.CENTER' - layout='{new BorderLayout()}'> - <JLabel id='taskActionLabel' constraints='BorderLayout.CENTER'/> - <JProgressBar id='taskProgressBar' constraints='BorderLayout.SOUTH'/> - </JPanel> <!--JPanel id='informationPanel' constraints='BorderLayout.SOUTH' layout='{new BorderLayout()}'> <JLabel id='informationLabel' constraints='BorderLayout.CENTER'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-03-12 13:12:49 UTC (rev 586) @@ -28,6 +28,7 @@ import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.MainUI; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; +import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -173,6 +174,9 @@ initUI(ui); + // installation layer de blocage en mode busy + SwingUtil.setLayerUI(ui.getRootPanel(), ui.getBusyBlockLayerUI()); + ui.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java 2013-03-12 13:12:49 UTC (rev 586) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.editor; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * 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.Function; import com.google.common.collect.Lists; import com.google.common.collect.Maps; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-03-12 13:12:49 UTC (rev 586) @@ -82,6 +82,7 @@ tutti.action.reload.actions= tutti.action.reload.application= tutti.action.reload.ui= +tutti.action.reloadTutti= tutti.action.removeCaracteristic= tutti.action.removeSpeciesBatch= tutti.action.removeSpeciesSubBatch= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-03-12 13:12:49 UTC (rev 586) @@ -89,6 +89,7 @@ tutti.action.reload.actions=Recharger les actions tutti.action.reload.application=Recharger l'application tutti.action.reload.ui=Recharger l'interface graphique +tutti.action.reloadTutti=Redémarrer Tutti tutti.action.removeCaracteristic=Supprimer la caractéristique tutti.action.removeSpeciesBatch=Supprimer le lot tutti.action.removeSpeciesProtocol=Supprimer l'espèce