[Sammoa-commits] r664 - in trunk/sammoa-ui-swing: . src/license src/main/filtered-resources src/main/java/fr/ulr/sammoa/ui/swing src/main/java/fr/ulr/sammoa/ui/swing/campaign src/main/java/fr/ulr/sammoa/ui/swing/flight src/main/java/fr/ulr/sammoa/ui/swing/flight/action src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/onBoard src/main/java/fr/ulr/sammoa/ui/swing/flight/effort src/main/java/fr/ulr/sammoa/ui/swing/home src/main/java/fr/ulr/sammoa/ui/swing/io/input src/main/java/fr/ulr/sammoa/ui/swing/io/input/a

Author: athimel Date: 2014-05-16 10:08:04 +0200 (Fri, 16 May 2014) New Revision: 664 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/664 Log: Update version Modified: trunk/sammoa-ui-swing/pom.xml trunk/sammoa-ui-swing/src/license/THIRD-PARTY.properties trunk/sammoa-ui-swing/src/main/filtered-resources/sammoa.properties trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/CloseAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/StartApp.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/UIDecoratorService.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUI.css trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUI.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUI.css trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectTableModel.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/AddAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BeginAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/CenterObservationAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/CircleBackAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/DeleteTransectAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/EndAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/LeftObservationAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextTransectAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/RightObservationAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StartAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StartAudioAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAudioAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidFlightAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidObservationAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidRouteAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/onBoard/OnBoardBarModel.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanel.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUI.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/UIImporter.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUI.css trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUI.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUI.css trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUI.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUIModel.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapLauncherUI.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUI.css trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUI.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/region/RegionUI.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/region/RegionUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect/TransectUI.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect/TransectUIHandler.java trunk/sammoa-ui-swing/src/main/resources/logback.xml Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/pom.xml 2014-05-16 08:08:04 UTC (rev 664) @@ -125,6 +125,11 @@ </dependency> <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-config</artifactId> + </dependency> + + <dependency> <groupId>org.swinglabs</groupId> <artifactId>jxlayer</artifactId> </dependency> Modified: trunk/sammoa-ui-swing/src/license/THIRD-PARTY.properties =================================================================== --- trunk/sammoa-ui-swing/src/license/THIRD-PARTY.properties 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/license/THIRD-PARTY.properties 2014-05-16 08:08:04 UTC (rev 664) @@ -1,18 +1,21 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - AL 2.0 # - Apache 2 # - Apache License 2.0 +# - Apache License, version 2.0 # - Apache Software Licenses # - BSD License # - BSD-3 Clause License +# - Common Development and Distribution License # - Common Public License Version 1.0 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License - v 1.0 -# - GNU General Public License - Version 2 with the class path exception -# - GNU LESSER GENERAL PUBLIC LICENSE +# - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public License # - GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. -# - GNU Lesser General Public License, version 2.1 # - GNU Library or Lesser General Public License # - General Public License (GPL) # - LGPL 2.1 @@ -22,14 +25,13 @@ # - MPL 1.1 # - New BSD License # - OpenMap Software License Agreement +# - Public Domain # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 -# - lgpl -# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Apr 23 23:57:44 CEST 2013 +#Thu May 15 16:05:25 CEST 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License Modified: trunk/sammoa-ui-swing/src/main/filtered-resources/sammoa.properties =================================================================== --- trunk/sammoa-ui-swing/src/main/filtered-resources/sammoa.properties 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/filtered-resources/sammoa.properties 2014-05-16 08:08:04 UTC (rev 664) @@ -31,7 +31,7 @@ hibernate.connection.username=sa hibernate.connection.password=sa hibernate.connection.driver_class=org.h2.Driver -hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider +#hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider sammoa.version=${project.version} sammoa.url=${project.url} Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/CloseAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/CloseAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/CloseAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -31,7 +31,7 @@ import javax.swing.JDialog; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 24/07/12 @@ -45,7 +45,7 @@ protected JComponent ui; public CloseAction(JComponent ui) { - super(_("sammoa.action.close")); + super(t("sammoa.action.close")); Preconditions.checkArgument(ui instanceof SammoaUI); this.ui = ui; } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2014-05-16 08:08:04 UTC (rev 664) @@ -48,24 +48,21 @@ import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.AboutPanel; import jaxx.runtime.swing.ErrorDialogUI; -import jaxx.runtime.swing.editor.config.ConfigUIHelper; -import org.nuiton.util.ApplicationConfig; +import jaxx.runtime.swing.config.ConfigUIHelper; +import org.nuiton.config.ApplicationConfig; import org.nuiton.widget.SwingSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.swing.JComponent; -import javax.swing.JOptionPane; -import javax.swing.UIManager; +import javax.swing.*; import javax.swing.plaf.BorderUIResource; -import java.awt.Color; -import java.awt.Desktop; +import java.awt.*; import java.io.File; import java.net.URL; import java.util.Calendar; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/05/12 @@ -153,7 +150,7 @@ default: case HOME: changeScreen(new HomeUI(context), - _("sammoa.title.home")); + t("sammoa.title.home")); break; case VALIDATION: case FLIGHT: @@ -162,27 +159,27 @@ Campaign campaign = flight.getCampaign(); changeScreen(flightUI, - _("sammoa.title.flight", - flight.getSystemId(), - campaign.getCode(), - campaign.getRegion().getCode(), - flight.getFlightNumber())); + t("sammoa.title.flight", + flight.getSystemId(), + campaign.getCode(), + campaign.getRegion().getCode(), + flight.getFlightNumber())); break; case CAMPAIGN: changeScreen(new CampaignUI(context), - _("sammoa.title.campaign")); + t("sammoa.title.campaign")); break; case EXPORT_MAP: changeScreen(new ExportMapUI(context), - _("sammoa.title.exportshape")); + t("sammoa.title.exportshape")); break; case EXPORT_APPLICATION: changeScreen(new ExportApplicationUI(context), - _("sammoa.title.exportApplication")); + t("sammoa.title.exportApplication")); break; case IMPORT_APPLICATION: changeScreen(new ImportApplicationUI(context), - _("sammoa.title.importApplication")); + t("sammoa.title.importApplication")); break; } @@ -225,7 +222,7 @@ ConfigUIHelper helper = new ConfigUIHelper(config); helper.registerCallBack( - "ui", n_("sammoa.action.reload.ui"), + "ui", n("sammoa.action.reload.ui"), SwingUtil.createActionIcon("reload-ui"), new Runnable() { @@ -235,7 +232,7 @@ } } ).registerCallBack( - "home", n_("sammoa.action.reload.home"), + "home", n("sammoa.action.reload.home"), SwingUtil.createActionIcon("config"), new Runnable() { @@ -248,7 +245,7 @@ } } ).registerCallBack( - "actions", n_("sammoa.action.reload.actions"), + "actions", n("sammoa.action.reload.actions"), SwingUtil.createActionIcon("config"), new Runnable() { @@ -264,7 +261,7 @@ } } ).registerCallBack( - "audio", n_("sammoa.action.reload.audio"), + "audio", n("sammoa.action.reload.audio"), SwingUtil.createActionIcon("config"), new Runnable() { @@ -282,7 +279,7 @@ } } ).registerCallBack( - "gps", n_("sammoa.action.reload.gps"), + "gps", n("sammoa.action.reload.gps"), SwingUtil.createActionIcon("config"), new Runnable() { @@ -299,8 +296,8 @@ // APPLICATION - helper.addCategory(n_("sammoa.config.category.applications"), - n_("sammoa.config.category.applications.description")) + helper.addCategory(n("sammoa.config.category.applications"), + n("sammoa.config.category.applications.description")) .addOption(SammoaConfig.SammoaConfigOption.SYSTEM_ID) .setOptionCallBack("home") .addOption(SammoaConfig.SammoaConfigOption.DATA_DIRECTORY) @@ -313,8 +310,8 @@ // SHORTCUT - helper.addCategory(n_("sammoa.config.category.shortcuts"), - n_("sammoa.config.category.shortcuts.description"), "actions") + helper.addCategory(n("sammoa.config.category.shortcuts"), + n("sammoa.config.category.shortcuts.description"), "actions") .addOption(SammoaConfig.SammoaConfigOption.KEY_START) .addOption(SammoaConfig.SammoaConfigOption.KEY_STOP) .addOption(SammoaConfig.SammoaConfigOption.KEY_BEGIN) @@ -332,8 +329,8 @@ // GPS - helper.addCategory(n_("sammoa.config.category.gps"), - n_("sammoa.config.category.gps.description"), "gps") + helper.addCategory(n("sammoa.config.category.gps"), + n("sammoa.config.category.gps.description"), "gps") .addOption(GpsConfig.GpsConfigOption.GPS_HANDLER, SammoaConfig.PROPERTY_GPS_CONFIG + "." + GpsConfig.PROPERTY_GPS_HNALDER_CLASS) .addOption(GpsConfig.GpsConfigOption.GPS_DEVICE) @@ -343,8 +340,8 @@ // AUDIO - helper.addCategory(n_("sammoa.config.category.audio"), - n_("sammoa.config.category.audio.description"), "audio") + helper.addCategory(n("sammoa.config.category.audio"), + n("sammoa.config.category.audio.description"), "audio") .addOption(AudioConfig.AudioConfigOption.SAMPLE_RATE) .addOption(AudioConfig.AudioConfigOption.SAMPLE_SIZE_IN_BITS) .addOption(AudioConfig.AudioConfigOption.RECORD_DELAY_IN_SECONDS) @@ -353,8 +350,8 @@ // OTHER - helper.addCategory(n_("sammoa.config.category.other"), - n_("sammoa.config.category.other.description")) + helper.addCategory(n("sammoa.config.category.other"), + n("sammoa.config.category.other.description")) .addOption(SammoaConfig.SammoaConfigOption.SITE_URL) .addOption(SammoaConfig.SammoaConfigOption.UI_CONFIG_FILE) .setOptionCallBack("ui"); @@ -408,13 +405,13 @@ currentBody = newBody; context.getSwingSession().add(currentBody); ui.getBody().setTitle(title); - ui.getBody().add(currentBody); + ui.getBody().add(currentBody, 1); } protected void closeSammoa(boolean exit) { if (checkCurrentFlight( - _("sammoa.confirmDialog.flightInProgress.message.exit"))) { + t("sammoa.confirmDialog.flightInProgress.message.exit"))) { context.getSwingSession().save(); @@ -451,7 +448,7 @@ public void showHome() { if (checkCurrentFlight( - _("sammoa.confirmDialog.flightInProgress.message.showHome"))) { + t("sammoa.confirmDialog.flightInProgress.message.showHome"))) { setScreen(SammoaScreen.HOME); } } @@ -467,8 +464,8 @@ String thirdPartyPath = "META-INF/" + name + "-THIRD-PARTY.txt"; AboutPanel about = new AboutPanel(); - about.setTitle(_("sammoa.title.about")); - about.setAboutText(_("sammoa.about.message")); + about.setTitle(t("sammoa.title.about")); + about.setAboutText(t("sammoa.about.message")); SammoaConfig config = context.getConfig(); int currentYear = Calendar.getInstance().get(Calendar.YEAR); @@ -480,10 +477,10 @@ years = inceptionYear + ""; } - about.setBottomText(_("sammoa.about.bottomText", - config.getOrganizationName(), - years, - config.getVersion())); + about.setBottomText(t("sammoa.about.bottomText", + config.getOrganizationName(), + years, + config.getVersion())); about.setIconPath(iconPath); about.setLicenseFile(licensePath); about.setThirdpartyFile(thirdPartyPath); @@ -500,7 +497,7 @@ URL siteURL = config.getSiteUrl(); - logger.info(_("sammoa.message.goto.site", siteURL)); + logger.info(t("sammoa.message.goto.site", siteURL)); if (logger.isDebugEnabled()) { logger.debug("goto " + siteURL); @@ -552,7 +549,7 @@ int dialogResponse = JOptionPane.showConfirmDialog( ui, message, - _("sammoa.confirmDialog.flightInProgress.title"), + t("sammoa.confirmDialog.flightInProgress.title"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, UIManager.getIcon("warning") Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/StartApp.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/StartApp.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/StartApp.java 2014-05-16 08:08:04 UTC (rev 664) @@ -40,7 +40,7 @@ import java.io.File; import java.util.Locale; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 16/05/12 @@ -105,7 +105,7 @@ if (logger.isErrorEnabled()) { logger.error("Error during db connection", ex); } - SammoaUtil.showErrorMessage(null, _("sammoa.messageDialog.persistence.error", + SammoaUtil.showErrorMessage(null, t("sammoa.messageDialog.persistence.error", ex.getDbUrl(), ex.getMessageWithCause())); System.exit(1); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/UIDecoratorService.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/UIDecoratorService.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/UIDecoratorService.java 2014-05-16 08:08:04 UTC (rev 664) @@ -33,12 +33,12 @@ import fr.ulr.sammoa.ui.swing.flight.TransectModel; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import jaxx.runtime.swing.renderer.DecoratorTableCellRenderer; -import org.nuiton.util.decorator.Decorator; +import org.nuiton.decorator.Decorator; -import javax.swing.ListCellRenderer; +import javax.swing.*; import javax.swing.table.TableCellRenderer; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 29/05/12 @@ -66,10 +66,10 @@ String result; if (strate == null) { - result = _("sammoa.strate.decorator.all"); + result = t("sammoa.strate.decorator.all"); } else { - result = _("sammoa.strate.decorator.strate", strate.getCode()); + result = t("sammoa.strate.decorator.strate", strate.getCode()); } return result; Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUI.css =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUI.css 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUI.css 2014-05-16 08:08:04 UTC (rev 664) @@ -79,7 +79,7 @@ } #beginDatePicker { - patternLayout:{_("sammoa.datePattern")}; + patternLayout:{t("sammoa.datePattern")}; date:{getModel().getBeginDate()}; } @@ -88,7 +88,7 @@ } #endDatePicker { - patternLayout:{_("sammoa.datePattern")}; + patternLayout:{t("sammoa.datePattern")}; date:{getModel().getEndDate()}; } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUI.jaxx 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUI.jaxx 2014-05-16 08:08:04 UTC (rev 664) @@ -35,7 +35,7 @@ jaxx.runtime.validator.swing.SwingValidatorUtil jaxx.runtime.validator.swing.SwingValidatorMessageTableModel - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUIHandler.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUIHandler.java 2014-05-16 08:08:04 UTC (rev 664) @@ -56,7 +56,7 @@ import java.io.IOException; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 04/07/12 @@ -290,7 +290,7 @@ @Override public String importCsvFile(File file) throws IOException { int nbImported = importCsvService.importObservers(getModel().getId(), file); - return _("sammoa.messageDialog.observers.import.success", nbImported); + return t("sammoa.messageDialog.observers.import.success", nbImported); } }; @@ -298,7 +298,7 @@ protected String onDbfLoaded(Iterable<Strate> elements, CampaignStorage storage) { int nbImported = importMapService.importStrates(storage.getId(), elements); - return _("sammoa.messageDialog.strates.import.success", nbImported); + return t("sammoa.messageDialog.strates.import.success", nbImported); } }; @@ -308,7 +308,7 @@ @Override protected String onDbfLoaded(Iterable<Transect> elements, CampaignStorage storage) { int nbImported = importMapService.importTransects(storage.getId(), elements); - return _("sammoa.messageDialog.transects.import.success", nbImported); + return t("sammoa.messageDialog.transects.import.success", nbImported); } }; Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUI.css =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUI.css 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUI.css 2014-05-16 08:08:04 UTC (rev 664) @@ -80,7 +80,7 @@ } #beginDatePicker { - patternLayout:{_("sammoa.dateTimePattern")}; + patternLayout:{t("sammoa.dateTimePattern")}; showPopupButton:false; editable:{model.isValidationMode()}; date:{bean.getBeginDate()}; @@ -91,7 +91,7 @@ } #endDatePicker { - patternLayout:{_("sammoa.dateTimePattern")}; + patternLayout:{t("sammoa.dateTimePattern")}; showPopupButton:false; editable:{model.isValidationMode()}; date:{bean.getEndDate()}; Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2014-05-16 08:08:04 UTC (rev 664) @@ -126,30 +126,16 @@ import jaxx.runtime.swing.editor.cell.NumberCellEditor; import org.apache.commons.lang3.BooleanUtils; import org.jdesktop.swingx.JXTable; -import org.nuiton.util.ApplicationConfig; import org.nuiton.util.TimeLog; import org.nuiton.validator.bean.list.BeanListValidator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.swing.AbstractButton; -import javax.swing.Action; -import javax.swing.ActionMap; -import javax.swing.DefaultCellEditor; -import javax.swing.Icon; -import javax.swing.InputMap; -import javax.swing.JButton; -import javax.swing.JCheckBox; -import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.JTable; -import javax.swing.KeyStroke; -import javax.swing.ListCellRenderer; -import javax.swing.ListSelectionModel; +import javax.swing.*; import javax.swing.event.ListSelectionEvent; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; -import java.awt.Component; +import java.awt.*; import java.awt.event.ComponentEvent; import java.awt.event.ComponentListener; import java.awt.event.ItemEvent; @@ -165,7 +151,7 @@ import java.util.Map; import java.util.Properties; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/05/12 @@ -389,7 +375,7 @@ List<Transect> transects = FluentIterable.from(transectFlights) .transform(TransectFlights.toTransect()) - .toImmutableList(); + .toList(); Map<Transect, Long> transectRealNbTimes = flightService.getTransectRealNbTimes(transects); @@ -875,7 +861,7 @@ List<Transect> entities = FluentIterable.from(transects) .transform(TransectModel.toTransect()) - .toImmutableList(); + .toList(); // Execute add transects to create the new transectFlights List<TransectFlight> transectFlights = @@ -1168,7 +1154,7 @@ informationDelegator.setShowLights(false); // add combo box to informationDelegator - JCheckBox followMapCheckBox = new JCheckBox(_("sammoa.map.mapFollow")); + JCheckBox followMapCheckBox = new JCheckBox(t("sammoa.map.mapFollow")); followMapCheckBox.addItemListener(new ItemListener() { @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectTableModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectTableModel.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectTableModel.java 2014-05-16 08:08:04 UTC (rev 664) @@ -38,7 +38,7 @@ import javax.swing.table.AbstractTableModel; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** @author sletellier <letellier@codelutin.com> */ public class TransectTableModel extends AbstractTableModel { @@ -149,7 +149,7 @@ protected enum TransectColumn { INDEX( - _("sammoa.flightPanel.table.column.index"), + t("sammoa.flightPanel.table.column.index"), true, Integer.class, TransectFlightModel.PROPERTY_INDEX @@ -176,14 +176,14 @@ // } }, NAME( - _("sammoa.flightPanel.table.column.name"), + t("sammoa.flightPanel.table.column.name"), false, TransectFlightModel.PROPERTY_TRANSECT, TransectModel.PROPERTY_SOURCE, Transect.PROPERTY_NAME ), POSITION_NAVIGATOR( - _("sammoa.flightPanel.table.column.position.navigator"), + t("sammoa.flightPanel.table.column.position.navigator"), true, Observer.class ) { @@ -200,7 +200,7 @@ } }, POSITION_LEFT( - _("sammoa.flightPanel.table.column.position.left"), + t("sammoa.flightPanel.table.column.position.left"), true, Observer.class ) { @@ -217,7 +217,7 @@ } }, POSITION_RIGHT( - _("sammoa.flightPanel.table.column.position.right"), + t("sammoa.flightPanel.table.column.position.right"), true, Observer.class ) { @@ -234,7 +234,7 @@ } }, POSITION_CO_NAVIGATOR( - _("sammoa.flightPanel.table.column.position.co-navigator"), + t("sammoa.flightPanel.table.column.position.co-navigator"), true, Observer.class ) { @@ -251,13 +251,13 @@ } }, CROSSING_NUMBER( - _("sammoa.flightPanel.table.column.crossingNumber"), + t("sammoa.flightPanel.table.column.crossingNumber"), true, int.class, TransectFlightModel.PROPERTY_CROSSING_NUMBER ), // NB_TIMES( -// _("sammoa.flightPanel.table.column.nbTimes"), +// t("sammoa.flightPanel.table.column.nbTimes"), // true, // Integer.class, // TransectFlightModel.PROPERTY_TRANSECT, @@ -265,7 +265,7 @@ // Transect.PROPERTY_NB_TIMES // ), DELETED( - _("sammoa.flightPanel.table.column.deleted"), + t("sammoa.flightPanel.table.column.deleted"), true, TransectFlightModel.class ) { @@ -279,7 +279,7 @@ } }, ACTION( - _("sammoa.flightPanel.table.column.action"), + t("sammoa.flightPanel.table.column.action"), true, TransectFlightModel.class ) { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/AddAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/AddAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/AddAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -31,7 +31,7 @@ import javax.swing.Action; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/07/12 @@ -44,7 +44,7 @@ public AddAction(JAXXContext context) { super(Resource.getIcon("/icons/action-add.png"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.add.tip")); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.add.tip")); bindModelProperty(FlightUIModel.PROPERTY_FLIGHT_STATE, false); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BeginAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BeginAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BeginAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -33,7 +33,7 @@ import javax.swing.Action; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/07/12 @@ -45,8 +45,8 @@ private static final long serialVersionUID = 1L; public BeginAction(JAXXContext context) { - super(_("sammoa.action.begin"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.begin.tip")); + super(t("sammoa.action.begin"), context); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.begin.tip")); bindModelProperty(FlightUIModel.PROPERTY_FLIGHT_STATE, false); bindModelProperty(FlightUIModel.PROPERTY_CURRENT_ROUTE, false); bindModelProperty(FlightUIModel.PROPERTY_NEXT_TRANSECT + ".deleted", false); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/CenterObservationAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/CenterObservationAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/CenterObservationAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -28,7 +28,7 @@ import javax.swing.Action; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/07/12 @@ -40,7 +40,7 @@ private static final long serialVersionUID = 1L; public CenterObservationAction(JAXXContext context) { - super(_("sammoa.observation.observations.center"), context, Position.NAVIGATOR); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.center.tip")); + super(t("sammoa.observation.observations.center"), context, Position.NAVIGATOR); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.center.tip")); } } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/CircleBackAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/CircleBackAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/CircleBackAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -37,7 +37,7 @@ import java.awt.event.ActionEvent; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/07/12 @@ -54,7 +54,7 @@ public CircleBackAction(JAXXContext context) { super(CIRCLE_BACK_ICON, context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.circleBack.tip")); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.circleBack.tip")); bindModelProperty(FlightUIModel.PROPERTY_CURRENT_ROUTE, false); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/DeleteTransectAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/DeleteTransectAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/DeleteTransectAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -37,7 +37,7 @@ import javax.swing.JComponent; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/09/12 @@ -53,7 +53,7 @@ public DeleteTransectAction(JAXXContext context) { super((String) null, context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.deleteTransect.tip")); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.deleteTransect.tip")); } @Override @@ -76,7 +76,7 @@ // #1372: If flight isn't started, we propose to delete definitely the transect if (FlightState.WAITING == getModel().getFlightState() && transectFlight.isDeleted()) { - if (SammoaUtil.askQuestion((FlightUI) context, _("sammoa.confirmDialog.deleteTransect.message"))) { + if (SammoaUtil.askQuestion((FlightUI) context, t("sammoa.confirmDialog.deleteTransect.message"))) { FlightService service = getSammoaUIContext().getService(FlightService.class); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/EndAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/EndAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/EndAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -30,7 +30,7 @@ import javax.swing.Action; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/07/12 @@ -42,8 +42,8 @@ private static final long serialVersionUID = 1L; public EndAction(JAXXContext context) { - super(_("sammoa.action.end"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.end.tip")); + super(t("sammoa.action.end"), context); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.end.tip")); bindModelProperty(FlightUIModel.PROPERTY_FLIGHT_STATE, false); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/LeftObservationAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/LeftObservationAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/LeftObservationAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -28,7 +28,7 @@ import javax.swing.Action; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/07/12 @@ -40,7 +40,7 @@ private static final long serialVersionUID = 1L; public LeftObservationAction(JAXXContext context) { - super(_("sammoa.observation.observations.left"), context, Position.FRONT_LEFT); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.left.tip")); + super(t("sammoa.observation.observations.left"), context, Position.FRONT_LEFT); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.left.tip")); } } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -30,7 +30,7 @@ import javax.swing.Action; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/07/12 @@ -42,8 +42,8 @@ private static final long serialVersionUID = 1L; public NextAction(JAXXContext context) { - super(_("sammoa.action.next"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.next.tip")); + super(t("sammoa.action.next"), context); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.next.tip")); bindModelProperty(FlightUIModel.PROPERTY_FLIGHT_STATE, false); bindModelProperty(FlightUIModel.PROPERTY_NEXT_TRANSECT + ".deleted", false); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextTransectAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextTransectAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextTransectAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -31,7 +31,7 @@ import javax.swing.JComponent; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/07/12 @@ -46,7 +46,7 @@ public NextTransectAction(JAXXContext context) { super(Resource.getIcon("/icons/action-next-transect.png"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.nextTransect.tip")); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.nextTransect.tip")); } @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/RightObservationAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/RightObservationAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/RightObservationAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -28,7 +28,7 @@ import javax.swing.Action; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/07/12 @@ -40,7 +40,7 @@ private static final long serialVersionUID = 1L; public RightObservationAction(JAXXContext context) { - super(_("sammoa.observation.observations.right"), context, Position.FRONT_RIGHT); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.right.tip")); + super(t("sammoa.observation.observations.right"), context, Position.FRONT_RIGHT); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.right.tip")); } } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StartAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StartAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StartAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -31,7 +31,7 @@ import javax.swing.Action; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 05/07/12 @@ -44,7 +44,7 @@ public StartAction(JAXXContext context) { super(Resource.getIcon("/icons/playback_play.png"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.start.tip")); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.start.tip")); bindModelProperty(FlightUIModel.PROPERTY_FLIGHT_STATE, false); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StartAudioAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StartAudioAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StartAudioAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -31,7 +31,7 @@ import javax.swing.Action; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 05/07/12 @@ -44,7 +44,7 @@ public StartAudioAction(JAXXContext context) { super(Resource.getIcon("/icons/playback_play.png"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.startAudio.tip")); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.startAudio.tip")); } @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -33,7 +33,7 @@ import javax.swing.Action; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 05/07/12 @@ -46,13 +46,13 @@ public StopAction(JAXXContext context) { super(Resource.getIcon("/icons/playback_stop.png"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.stop.tip")); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.stop.tip")); bindModelProperty(FlightUIModel.PROPERTY_FLIGHT_STATE, false); } @Override public void actionPerformed(ActionEvent e) { - if (SammoaUtil.askQuestion((FlightUI) context, _("sammoa.confirmDialog.stopFlight.message"))) { + if (SammoaUtil.askQuestion((FlightUI) context, t("sammoa.confirmDialog.stopFlight.message"))) { getFlightController().stop(); } } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAudioAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAudioAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAudioAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -31,7 +31,7 @@ import javax.swing.Action; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 05/07/12 @@ -44,7 +44,7 @@ public StopAudioAction(JAXXContext context) { super(Resource.getIcon("/icons/playback_stop.png"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.stopAudio.tip")); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.stopAudio.tip")); } @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -35,7 +35,7 @@ import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 23/08/12 @@ -123,7 +123,7 @@ protected boolean askConfirmDelete(String label) { return SammoaUtil.askQuestion( (FlightUI) context, - _("sammoa.confirmDialog.validation.delete.message", label) + t("sammoa.confirmDialog.validation.delete.message", label) ); } @@ -131,7 +131,7 @@ String cascadeLabel) { return SammoaUtil.askQuestion( (FlightUI) context, - _("sammoa.confirmDialog.validation.deleteByCascade.message", label, cascadeLabel) + t("sammoa.confirmDialog.validation.deleteByCascade.message", label, cascadeLabel) ); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidFlightAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidFlightAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidFlightAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -35,7 +35,7 @@ import java.awt.event.ActionEvent; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 23/08/12 @@ -52,8 +52,8 @@ protected boolean validatorIsAdjusting; public ValidFlightAction(JAXXContext context) { - super(_("sammoa.action.validFlight"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.validFlight.tip")); + super(t("sammoa.action.validFlight"), context); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.validFlight.tip")); } @Override @@ -64,22 +64,22 @@ boolean hasDeletedTransect = Validables.isAnyDeleted(transectFlights); if (!hasDeletedTransect - || askConfirmDeleteByCascade(_("sammoa.validable.flight"), - _("sammoa.validable.transect"))) { + || askConfirmDeleteByCascade(t("sammoa.validable.flight"), + t("sammoa.validable.transect"))) { List<Route> routes = getModel().getRoutes(); boolean hasDeletedRoute = Validables.isAnyDeleted(routes); if (!hasDeletedRoute - || askConfirmDeleteByCascade(_("sammoa.validable.flight"), - _("sammoa.validable.route"))) { + || askConfirmDeleteByCascade(t("sammoa.validable.flight"), + t("sammoa.validable.route"))) { boolean hasDeletedObservation = Validables.isAnyDeleted(getModel().getObservations()); if (!hasDeletedObservation - || askConfirmDeleteByCascade(_("sammoa.validable.flight"), - _("sammoa.validable.observation"))) { + || askConfirmDeleteByCascade(t("sammoa.validable.flight"), + t("sammoa.validable.observation"))) { // Toggle valid value boolean valid = !getValidModel().getFlightValidFlag(flight); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidObservationAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidObservationAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidObservationAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -31,7 +31,7 @@ import javax.swing.Action; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 23/08/12 @@ -46,8 +46,8 @@ private static final long serialVersionUID = 1L; public ValidObservationAction(JAXXContext context) { - super(_("sammoa.action.validObservation"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.validObservation.tip")); + super(t("sammoa.action.validObservation"), context); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.validObservation.tip")); } @Override @@ -63,7 +63,7 @@ if (observation.isDeleted()) { - if (askConfirmDelete(_("sammoa.validable.observation"))) { + if (askConfirmDelete(t("sammoa.validable.observation"))) { Observation observationChanged = getValidationService().validateObservation(observation); getModel().removeObservation(observationChanged); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidRouteAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidRouteAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidRouteAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -32,7 +32,7 @@ import javax.swing.Action; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 23/08/12 @@ -49,8 +49,8 @@ protected boolean validatorIsAdjusting; public ValidRouteAction(JAXXContext context) { - super(_("sammoa.action.validRoute"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.validRoute.tip")); + super(t("sammoa.action.validRoute"), context); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.validRoute.tip")); } @Override @@ -69,7 +69,7 @@ if (route.isDeleted()) { - if (askConfirmDelete(_("sammoa.validable.route"))) { + if (askConfirmDelete(t("sammoa.validable.route"))) { Route routeChanged = getValidationService().validateRoute(route); getModel().removeRoute(routeChanged); } @@ -80,8 +80,8 @@ getModel().getObservations(), route, getModel().getRoutes()); if (!hasDeletedObservation - || askConfirmDeleteByCascade(_("sammoa.validable.route"), - _("sammoa.validable.observation"))) { + || askConfirmDeleteByCascade(t("sammoa.validable.route"), + t("sammoa.validable.observation"))) { Route routeChanged = getValidationService().validateRoute(route); getModel().updateRoute(routeChanged); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -37,7 +37,7 @@ import javax.swing.Action; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 23/08/12 @@ -54,8 +54,8 @@ protected boolean validatorIsAdjusting; public ValidTransectAction(JAXXContext context) { - super(_("sammoa.action.validTransect"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.validTransect.tip")); + super(t("sammoa.action.validTransect"), context); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.validTransect.tip")); } @Override @@ -78,7 +78,7 @@ if (transectFlight.isDeleted()) { - if (askConfirmDelete(_("sammoa.validable.transect"))) { + if (askConfirmDelete(t("sammoa.validable.transect"))) { getValidationService().validateTransectFlight(getModel().getFlight(), transectFlight); getModel().removeTransectFlight(index); } @@ -93,8 +93,8 @@ boolean hasDeletedRoute = routes.anyMatch(Validables.isDeleted()); if (!hasDeletedRoute - || askConfirmDeleteByCascade(_("sammoa.validable.transect"), - _("sammoa.validable.route"))) { + || askConfirmDeleteByCascade(t("sammoa.validable.transect"), + t("sammoa.validable.route"))) { boolean hasDeletedObservation = false; for (Route route : routes) { @@ -103,8 +103,8 @@ } if (!hasDeletedObservation - || askConfirmDeleteByCascade(_("sammoa.validable.transect"), - _("sammoa.validable.observation"))) { + || askConfirmDeleteByCascade(t("sammoa.validable.transect"), + t("sammoa.validable.observation"))) { TransectFlight transectFlightChanged = getValidationService().validateTransectFlight(getModel().getFlight(), transectFlight); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/onBoard/OnBoardBarModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/onBoard/OnBoardBarModel.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/onBoard/OnBoardBarModel.java 2014-05-16 08:08:04 UTC (rev 664) @@ -31,7 +31,7 @@ import java.awt.Color; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** @author sletellier <letellier@codelutin.com> */ public class OnBoardBarModel extends AbstractSerializableBean implements GpsLocationListener { @@ -51,7 +51,7 @@ protected Color effortPanelColor; public String getAlt() { - return _("sammoa.statusbar.alt", alt); + return t("sammoa.statusbar.alt", alt); } public void setAlt(float alt) { @@ -61,7 +61,7 @@ } public String getSpeed() { - return _("sammoa.statusbar.speed", speed); + return t("sammoa.statusbar.speed", speed); } public void setSpeed(float speed) { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanel.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanel.jaxx 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanel.jaxx 2014-05-16 08:08:04 UTC (rev 664) @@ -43,7 +43,7 @@ jaxx.runtime.swing.model.GenericListModel jaxx.runtime.validator.swing.SwingListValidatorMessageTableModel - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2014-05-16 08:08:04 UTC (rev 664) @@ -78,25 +78,18 @@ import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.TableColumnExt; -import org.nuiton.util.decorator.Decorator; +import org.nuiton.decorator.Decorator; import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.list.BeanListValidator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.swing.Action; -import javax.swing.DefaultCellEditor; -import javax.swing.JButton; -import javax.swing.JComboBox; -import javax.swing.JTable; -import javax.swing.JTextField; -import javax.swing.ListCellRenderer; +import javax.swing.*; import javax.swing.border.LineBorder; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableModel; -import java.awt.Color; -import java.awt.Component; +import java.awt.*; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; @@ -105,8 +98,8 @@ import java.util.Date; import java.util.List; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * Handler of {@link EffortPanel} ui. @@ -297,42 +290,42 @@ SwingUtil.setI18nTableHeaderRenderer( table, - n_("sammoa.observations.routeTable.column.effortNumber"), - n_("sammoa.observations.routeTable.column.effortNumber.tip"), - n_("sammoa.observations.routeTable.column.beginTime"), - n_("sammoa.observations.routeTable.column.beginTime.tip"), - n_("sammoa.observations.routeTable.column.routeType"), - n_("sammoa.observations.routeTable.column.routeType.tip"), - n_("sammoa.observations.routeTable.column.transect"), - n_("sammoa.observations.routeTable.column.transect.tip"), - n_("sammoa.observations.routeTable.column.seaState"), - n_("sammoa.observations.routeTable.column.seaState.tip"), - n_("sammoa.observations.routeTable.column.swell"), - n_("sammoa.observations.routeTable.column.swell.tip"), - n_("sammoa.observations.routeTable.column.turbidity"), - n_("sammoa.observations.routeTable.column.turbidity.tip"), - n_("sammoa.observations.routeTable.column.skyGlint"), - n_("sammoa.observations.routeTable.column.skyGlint.tip"), - n_("sammoa.observations.routeTable.column.glareFrom"), - n_("sammoa.observations.routeTable.column.glareFrom.tip"), - n_("sammoa.observations.routeTable.column.glareTo"), - n_("sammoa.observations.routeTable.column.glareTo.tip"), - n_("sammoa.observations.routeTable.column.glareSeverity"), - n_("sammoa.observations.routeTable.column.glareSeverity.tip"), - n_("sammoa.observations.routeTable.column.glareUnder"), - n_("sammoa.observations.routeTable.column.glareUnder.tip"), - n_("sammoa.observations.routeTable.column.cloudCover"), - n_("sammoa.observations.routeTable.column.cloudCover.tip"), - n_("sammoa.observations.routeTable.column.subjectiveConditions"), - n_("sammoa.observations.routeTable.column.subjectiveConditions.tip"), - n_("sammoa.observations.routeTable.column.unexpectedLeft"), - n_("sammoa.observations.routeTable.column.unexpectedLeft.tip"), - n_("sammoa.observations.routeTable.column.unexpectedRight"), - n_("sammoa.observations.routeTable.column.unexpectedRight.tip"), - n_("sammoa.observations.routeTable.column.comment"), - n_("sammoa.observations.routeTable.column.comment.tip"), - n_("sammoa.observations.routeTable.column.deleted"), - n_("sammoa.observations.routeTable.column.deleted.tip") + n("sammoa.observations.routeTable.column.effortNumber"), + n("sammoa.observations.routeTable.column.effortNumber.tip"), + n("sammoa.observations.routeTable.column.beginTime"), + n("sammoa.observations.routeTable.column.beginTime.tip"), + n("sammoa.observations.routeTable.column.routeType"), + n("sammoa.observations.routeTable.column.routeType.tip"), + n("sammoa.observations.routeTable.column.transect"), + n("sammoa.observations.routeTable.column.transect.tip"), + n("sammoa.observations.routeTable.column.seaState"), + n("sammoa.observations.routeTable.column.seaState.tip"), + n("sammoa.observations.routeTable.column.swell"), + n("sammoa.observations.routeTable.column.swell.tip"), + n("sammoa.observations.routeTable.column.turbidity"), + n("sammoa.observations.routeTable.column.turbidity.tip"), + n("sammoa.observations.routeTable.column.skyGlint"), + n("sammoa.observations.routeTable.column.skyGlint.tip"), + n("sammoa.observations.routeTable.column.glareFrom"), + n("sammoa.observations.routeTable.column.glareFrom.tip"), + n("sammoa.observations.routeTable.column.glareTo"), + n("sammoa.observations.routeTable.column.glareTo.tip"), + n("sammoa.observations.routeTable.column.glareSeverity"), + n("sammoa.observations.routeTable.column.glareSeverity.tip"), + n("sammoa.observations.routeTable.column.glareUnder"), + n("sammoa.observations.routeTable.column.glareUnder.tip"), + n("sammoa.observations.routeTable.column.cloudCover"), + n("sammoa.observations.routeTable.column.cloudCover.tip"), + n("sammoa.observations.routeTable.column.subjectiveConditions"), + n("sammoa.observations.routeTable.column.subjectiveConditions.tip"), + n("sammoa.observations.routeTable.column.unexpectedLeft"), + n("sammoa.observations.routeTable.column.unexpectedLeft.tip"), + n("sammoa.observations.routeTable.column.unexpectedRight"), + n("sammoa.observations.routeTable.column.unexpectedRight.tip"), + n("sammoa.observations.routeTable.column.comment"), + n("sammoa.observations.routeTable.column.comment.tip"), + n("sammoa.observations.routeTable.column.deleted"), + n("sammoa.observations.routeTable.column.deleted.tip") ); init(table, new SelectionModelAdapter<Route>() { @@ -439,38 +432,38 @@ SwingUtil.setI18nTableHeaderRenderer( table, - n_("sammoa.observations.observationTable.column.observationNumber"), - n_("sammoa.observations.observationTable.column.observationNumber.tip"), - n_("sammoa.observations.observationTable.column.observationTime"), - n_("sammoa.observations.observationTable.column.observationTime.tip"), - n_("sammoa.observations.observationTable.column.position"), - n_("sammoa.observations.observationTable.column.position.tip"), - n_("sammoa.observations.observationTable.column.podSize"), - n_("sammoa.observations.observationTable.column.podSize.tip"), - n_("sammoa.observations.observationTable.column.species"), - n_("sammoa.observations.observationTable.column.species.tip"), - n_("sammoa.observations.observationTable.column.age"), - n_("sammoa.observations.observationTable.column.age.tip"), - n_("sammoa.observations.observationTable.column.decAngle"), - n_("sammoa.observations.observationTable.column.decAngle.tip"), - n_("sammoa.observations.observationTable.column.cue"), - n_("sammoa.observations.observationTable.column.cue.tip"), - n_("sammoa.observations.observationTable.column.behaviour"), - n_("sammoa.observations.observationTable.column.behaviour.tip"), - n_("sammoa.observations.observationTable.column.swimDir"), - n_("sammoa.observations.observationTable.column.swimDir.tip"), - n_("sammoa.observations.observationTable.column.calves"), - n_("sammoa.observations.observationTable.column.calves.tip"), - n_("sammoa.observations.observationTable.column.photo"), - n_("sammoa.observations.observationTable.column.photo.tip"), - n_("sammoa.observations.observationTable.column.comment"), - n_("sammoa.observations.observationTable.column.comment.tip"), - n_("sammoa.observations.observationTable.column.observationStatus"), - n_("sammoa.observations.observationTable.column.observationStatus.tip"), - n_("sammoa.observations.observationTable.column.deleted"), - n_("sammoa.observations.observationTable.column.deleted.tip"), - n_("sammoa.observations.observationTable.column.circleback"), - n_("sammoa.observations.observationTable.column.circleback.tip") + n("sammoa.observations.observationTable.column.observationNumber"), + n("sammoa.observations.observationTable.column.observationNumber.tip"), + n("sammoa.observations.observationTable.column.observationTime"), + n("sammoa.observations.observationTable.column.observationTime.tip"), + n("sammoa.observations.observationTable.column.position"), + n("sammoa.observations.observationTable.column.position.tip"), + n("sammoa.observations.observationTable.column.podSize"), + n("sammoa.observations.observationTable.column.podSize.tip"), + n("sammoa.observations.observationTable.column.species"), + n("sammoa.observations.observationTable.column.species.tip"), + n("sammoa.observations.observationTable.column.age"), + n("sammoa.observations.observationTable.column.age.tip"), + n("sammoa.observations.observationTable.column.decAngle"), + n("sammoa.observations.observationTable.column.decAngle.tip"), + n("sammoa.observations.observationTable.column.cue"), + n("sammoa.observations.observationTable.column.cue.tip"), + n("sammoa.observations.observationTable.column.behaviour"), + n("sammoa.observations.observationTable.column.behaviour.tip"), + n("sammoa.observations.observationTable.column.swimDir"), + n("sammoa.observations.observationTable.column.swimDir.tip"), + n("sammoa.observations.observationTable.column.calves"), + n("sammoa.observations.observationTable.column.calves.tip"), + n("sammoa.observations.observationTable.column.photo"), + n("sammoa.observations.observationTable.column.photo.tip"), + n("sammoa.observations.observationTable.column.comment"), + n("sammoa.observations.observationTable.column.comment.tip"), + n("sammoa.observations.observationTable.column.observationStatus"), + n("sammoa.observations.observationTable.column.observationStatus.tip"), + n("sammoa.observations.observationTable.column.deleted"), + n("sammoa.observations.observationTable.column.deleted.tip"), + n("sammoa.observations.observationTable.column.circleback"), + n("sammoa.observations.observationTable.column.circleback.tip") ); init(table, new SelectionModelAdapter<Observation>() { @@ -720,12 +713,12 @@ { TableCellRenderer defaultDateCellRenderer = table.getDefaultRenderer(Date.class); TableCellRenderer renderer = JAXXWidgetUtil.newDateTableCellRenderer( - defaultDateCellRenderer, _("sammoa.timePattern")); + defaultDateCellRenderer, t("sammoa.timePattern")); table.setDefaultRenderer(Date.class, renderer); JAXXDatePicker datePicker = new JAXXDatePicker(); datePicker.setShowPopupButton(false); - datePicker.setPatternLayout(_("sammoa.timePattern")); + datePicker.setPatternLayout(t("sammoa.timePattern")); JTextField textField = datePicker.getEditor(); // textField.addKeyListener(goNextCellAdapter); textField.setBorder(new LineBorder(Color.GRAY, 2)); @@ -844,7 +837,7 @@ TransectFlight value = getCellEditorValue(); if (value == null || Objects.equal(value, initValue) - || SammoaUtil.askQuestion(editorComponent, _( + || SammoaUtil.askQuestion(editorComponent, t( "sammoa.confirmDialog.changeRouteTransect.message", value.getTransect().getName()))) { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUI.jaxx 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUI.jaxx 2014-05-16 08:08:04 UTC (rev 664) @@ -32,7 +32,7 @@ jaxx.runtime.swing.model.GenericListModel - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIHandler.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIHandler.java 2014-05-16 08:08:04 UTC (rev 664) @@ -50,7 +50,7 @@ import java.util.List; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 19/07/12 @@ -289,7 +289,7 @@ // can not authorize to go to this screen SammoaUtil.showErrorMessage( - ui, _("sammoa.validator.no.species.in.region")); + ui, t("sammoa.validator.no.species.in.region")); return; } @@ -305,7 +305,7 @@ int nextFlightNumber = flightService.getNextFlightNumber(); String response = JOptionPane.showInputDialog( - ui, _("sammoa.inputDialog.flightNumber.message"), nextFlightNumber); + ui, t("sammoa.inputDialog.flightNumber.message"), nextFlightNumber); if (response == null) { // nothing to do @@ -316,7 +316,7 @@ if (flightNumber < nextFlightNumber) { SammoaUtil.showErrorMessage( - ui, _("sammoa.inputDialog.flightNumber.error.lessThanNextFlightNumber", nextFlightNumber)); + ui, t("sammoa.inputDialog.flightNumber.error.lessThanNextFlightNumber", nextFlightNumber)); } else { @@ -328,7 +328,7 @@ } catch (NumberFormatException ex) { SammoaUtil.showErrorMessage( - ui, _("sammoa.inputDialog.flightNumber.error.notANumber")); + ui, t("sammoa.inputDialog.flightNumber.error.notANumber")); } } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/UIImporter.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/UIImporter.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/UIImporter.java 2014-05-16 08:08:04 UTC (rev 664) @@ -26,11 +26,11 @@ import fr.ulr.sammoa.application.io.CampaignStorage; import fr.ulr.sammoa.application.io.input.map.ShpImporter; import fr.ulr.sammoa.ui.swing.util.SammoaUtil; -import org.nuiton.util.csv.ImportRuntimeException; +import org.nuiton.csv.ImportRuntimeException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.awt.Component; +import java.awt.*; import java.io.File; import java.io.IOException; Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUI.css =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUI.css 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUI.css 2014-05-16 08:08:04 UTC (rev 664) @@ -58,7 +58,7 @@ } #backupPanel { - border:{new TitledBorder(_("sammoa.label.exportApplication.backup.panel"))}; + border:{new TitledBorder(t("sammoa.label.exportApplication.backup.panel"))}; } #backupCheckBox { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUI.jaxx 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUI.jaxx 2014-05-16 08:08:04 UTC (rev 664) @@ -35,7 +35,7 @@ java.awt.BorderLayout javax.swing.UIManager - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUIHandler.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUIHandler.java 2014-05-16 08:08:04 UTC (rev 664) @@ -60,8 +60,8 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * UI Handler fo {@link ImportApplicationUI}. @@ -198,7 +198,7 @@ backupService.backupApplication(backupFilename); SammoaUtil.showSuccessMessage( frame, - _("sammoa.messageDialog.sammoa.backup.success", + t("sammoa.messageDialog.sammoa.backup.success", getBackupFile(backupFilename))); } catch (Exception e) { ErrorDialogUI.showError(e); @@ -218,7 +218,7 @@ SammoaUtil.showSuccessMessage( frame, - _("sammoa.messageDialog.aplication.import.success", + t("sammoa.messageDialog.aplication.import.success", model.getImportFile())); } catch (Exception e) { @@ -235,7 +235,7 @@ public String getBackupInfo(String filename) { File backupFile = getBackupFile(filename == null ? "" : filename); - String result = _("sammoa.label.exportApplication.backupInfo", backupFile); + String result = t("sammoa.label.exportApplication.backupInfo", backupFile); return result; } @@ -336,24 +336,24 @@ table.setModel(new FlightTableModel(model.getFlightEntries(), true)); infoLabel = - _("sammoa.info.importApplication.importfile.loaded.on.existingCampaign", name); + t("sammoa.info.importApplication.importfile.loaded.on.existingCampaign", name); SwingUtil.setI18nTableHeaderRenderer( table, - n_("sammoa.importApplication.flightTable.column.flightName"), - n_("sammoa.importApplication.flightTable.column.flightName.tip"), - n_("sammoa.importApplication.flightTable.column.flightExist"), - n_("sammoa.importApplication.flightTable.column.flightExist.tip"), - n_("sammoa.importApplication.flightTable.column.toTreat"), - n_("sammoa.importApplication.flightTable.column.toTreat.tip")); + n("sammoa.importApplication.flightTable.column.flightName"), + n("sammoa.importApplication.flightTable.column.flightName.tip"), + n("sammoa.importApplication.flightTable.column.flightExist"), + n("sammoa.importApplication.flightTable.column.flightExist.tip"), + n("sammoa.importApplication.flightTable.column.toTreat"), + n("sammoa.importApplication.flightTable.column.toTreat.tip")); } else { table.setModel(new FlightTableModel(model.getFlightEntries(), false)); - infoLabel = _("sammoa.info.importApplication.importfile.loaded.on.newCampaign", name); + infoLabel = t("sammoa.info.importApplication.importfile.loaded.on.newCampaign", name); SwingUtil.setI18nTableHeaderRenderer( table, - n_("sammoa.importApplication.flightTable.column.flightName"), - n_("sammoa.importApplication.flightTable.column.flightName.tip")); + n("sammoa.importApplication.flightTable.column.flightName"), + n("sammoa.importApplication.flightTable.column.flightName.tip")); } } else { @@ -361,7 +361,7 @@ // nothing is loaded, just remove table model and change label table.setModel(new DefaultTableModel()); - infoLabel = _("sammoa.info.importApplication.no.importfile.loaded"); + infoLabel = t("sammoa.info.importApplication.no.importfile.loaded"); } label.setText(infoLabel); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUI.css =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUI.css 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUI.css 2014-05-16 08:08:04 UTC (rev 664) @@ -102,7 +102,7 @@ } #backupPanel { - border:{new TitledBorder(_("sammoa.label.exportApplication.backup.panel"))}; + border:{new TitledBorder(t("sammoa.label.exportApplication.backup.panel"))}; } #backupCheckBox { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUI.jaxx 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUI.jaxx 2014-05-16 08:08:04 UTC (rev 664) @@ -34,7 +34,7 @@ java.io.File javax.swing.UIManager - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUIHandler.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUIHandler.java 2014-05-16 08:08:04 UTC (rev 664) @@ -41,12 +41,12 @@ import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; +import org.nuiton.decorator.Decorator; import org.nuiton.util.FileUtil; -import org.nuiton.util.decorator.Decorator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.swing.JFrame; +import javax.swing.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; @@ -55,7 +55,7 @@ import java.util.Date; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Handler of {@link ExportApplicationUI}. @@ -221,7 +221,7 @@ backupService.backupApplication(backupFilename); SammoaUtil.showSuccessMessage( frame, - _("sammoa.messageDialog.sammoa.backup.success", + t("sammoa.messageDialog.sammoa.backup.success", getBackupFile(backupFilename))); } catch (Exception e) { ErrorDialogUI.showError(e); @@ -239,7 +239,7 @@ SammoaUtil.showSuccessMessage( frame, - _("sammoa.messageDialog.sammoa.export.success", + t("sammoa.messageDialog.sammoa.export.success", dataModel.getExportFile())); boolean removeFlightId = false; @@ -285,7 +285,7 @@ public String getBackupInfo(String filename) { File backupFile = getBackupFile(filename == null ? "" : filename); - String result = _("sammoa.label.exportApplication.backupInfo", backupFile); + String result = t("sammoa.label.exportApplication.backupInfo", backupFile); return result; } @@ -367,7 +367,7 @@ if (dataModel.getExportFile().exists()) { doExport = SammoaUtil.askQuestion( ui, - _("sammoa.messageDialog.sammoa.exportFile.alreadyExists", + t("sammoa.messageDialog.sammoa.exportFile.alreadyExists", dataModel.getExportFile())); } return doExport; @@ -380,8 +380,8 @@ public void chooseExportDirectory() { File f = SammoaUtil.chooseDirectory( ui, - _("sammoa.title.choose.export.directory"), - _("sammoa.action.choose.export.directory"), + t("sammoa.title.choose.export.directory"), + t("sammoa.action.choose.export.directory"), ui.getModel().getExportDirectory() ); ui.getModel().setExportDirectory(f); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUIModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUIModel.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUIModel.java 2014-05-16 08:08:04 UTC (rev 664) @@ -30,7 +30,7 @@ import fr.ulr.sammoa.persistence.Campaign; import fr.ulr.sammoa.persistence.Flight; import fr.ulr.sammoa.ui.swing.io.AbstractApplicationModelWithBackup; -import org.nuiton.topia.persistence.TopiaId; +import org.nuiton.topia.persistence.TopiaEntities; import java.io.File; import java.util.List; @@ -168,7 +168,7 @@ ExportApplicationModel result = ExportApplicationModel.newModel( new File(getExportDirectory(), getExportFilename()), getSelectedCampaign().getTopiaId(), - Iterables.transform(flightsToExport, TopiaId.GET_TOPIA_ID) + Iterables.transform(flightsToExport, TopiaEntities.getTopiaIdFunction()) ); return result; } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapLauncherUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapLauncherUI.jaxx 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapLauncherUI.jaxx 2014-05-16 08:08:04 UTC (rev 664) @@ -28,7 +28,7 @@ java.io.File javax.swing.UIManager - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUI.css =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUI.css 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUI.css 2014-05-16 08:08:04 UTC (rev 664) @@ -35,7 +35,7 @@ }*/ #campainPeriodFilter { - border:{new TitledBorder(_("sammoa.label.campaign.period.filter"))}; + border:{new TitledBorder(t("sammoa.label.campaign.period.filter"))}; } #campaignBeginDateLabel { @@ -43,7 +43,7 @@ } #beginDatePicker { - patternLayout:{_("sammoa.datePattern")}; + patternLayout:{t("sammoa.datePattern")}; date:{getModel().getBeginDate()}; } @@ -52,7 +52,7 @@ } #endDatePicker { - patternLayout:{_("sammoa.datePattern")}; + patternLayout:{t("sammoa.datePattern")}; date:{getModel().getEndDate()}; } @@ -60,28 +60,28 @@ beanType:{Strate.class}; showReset:true; list:{strateFilter}; - labelText:{_("sammoa.label.strateFilter")}; + labelText:{t("sammoa.label.strateFilter")}; } #routeTypeFilterListHeader { beanType:{RouteType.class}; showReset:true; list:{routeTypeFilter}; - labelText:{_("sammoa.label.routeTypeFilter")}; + labelText:{t("sammoa.label.routeTypeFilter")}; } #speciesTypeFilterListHeader { beanType:{StringRef.class}; showReset:true; list:{speciesTypeFilter}; - labelText:{_("sammoa.label.speciesTypeFilter")}; + labelText:{t("sammoa.label.speciesTypeFilter")}; } #speciesFilterListHeader { beanType:{Species.class}; showReset:true; list:{speciesFilter}; - labelText:{_("sammoa.label.speciesFilter")}; + labelText:{t("sammoa.label.speciesFilter")}; } #quitButton { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUI.jaxx 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUI.jaxx 2014-05-16 08:08:04 UTC (rev 664) @@ -38,7 +38,7 @@ java.awt.BorderLayout java.awt.event.ItemEvent - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java 2014-05-16 08:08:04 UTC (rev 664) @@ -44,20 +44,15 @@ import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.swing.OneClicListSelectionModel; import jaxx.runtime.swing.editor.bean.BeanListHeader; +import org.nuiton.decorator.Decorator; +import org.nuiton.decorator.DecoratorUtil; +import org.nuiton.decorator.JXPathDecorator; import org.nuiton.util.FileUtil; -import org.nuiton.util.decorator.Decorator; -import org.nuiton.util.decorator.DecoratorUtil; -import org.nuiton.util.decorator.JXPathDecorator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.JButton; -import javax.swing.JDialog; -import javax.swing.JFrame; -import javax.swing.JList; -import java.awt.Dimension; +import javax.swing.*; +import java.awt.*; import java.awt.event.ActionEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -66,7 +61,7 @@ import java.util.Date; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Handler of {@link ExportMapUI}. @@ -257,8 +252,8 @@ public void chooseEffortDirectory() { File f = SammoaUtil.chooseDirectory( ui, - _("sammoa.title.choose.export.directory"), - _("sammoa.action.choose.export.directory"), + t("sammoa.title.choose.export.directory"), + t("sammoa.action.choose.export.directory"), ui.getModel().getExportDirectory() ); ui.getModel().setExportDirectory(f); @@ -267,15 +262,15 @@ public void exportEfforts() { Action startAction = new AbstractStartAction( - _("sammoa.action.startExport"), + t("sammoa.action.startExport"), ui) { private static final long serialVersionUID = 1L; @Override protected String getSuccessMessage(int nbRow, ExportMapModel dataModel) { - return _("sammoa.messageDialog.map.export.success", - nbRow, dataModel.getExportDirectory()); + return t("sammoa.messageDialog.map.export.success", + nbRow, dataModel.getExportDirectory()); } @Override @@ -301,7 +296,7 @@ model.setSelectedRouteTypes( getFilterValues(RouteType.class, ui.getRouteTypeFilter())); - displayExportLauncher(_("sammoa.title.export.exportEfforts"), + displayExportLauncher(t("sammoa.title.export.exportEfforts"), model.getExportEffortsFilename(), model, startAction); @@ -311,15 +306,15 @@ public void exportObservations() { Action startAction = new AbstractStartAction( - _("sammoa.action.startExport"), + t("sammoa.action.startExport"), ui) { private static final long serialVersionUID = 1L; @Override protected String getSuccessMessage(int nbRow, ExportMapModel dataModel) { - return _("sammoa.messageDialog.map.export.success", - nbRow, dataModel.getExportDirectory()); + return t("sammoa.messageDialog.map.export.success", + nbRow, dataModel.getExportDirectory()); } @Override @@ -350,7 +345,7 @@ model.setSelectedSpeciesTypes( getFilterValues(StringRef.class, ui.getSpeciesTypeFilter())); - displayExportLauncher(_("sammoa.title.export.exportObservations"), + displayExportLauncher(t("sammoa.title.export.exportObservations"), model.getExportObservationsFilename(), model, startAction); @@ -359,15 +354,15 @@ public void exportGeoPoints() { Action startAction = new AbstractStartAction( - _("sammoa.action.startExport"), + t("sammoa.action.startExport"), ui) { private static final long serialVersionUID = 1L; @Override protected String getSuccessMessage(int nbRow, ExportMapModel dataModel) { - return _("sammoa.messageDialog.map.export.success", - nbRow, dataModel.getExportDirectory()); + return t("sammoa.messageDialog.map.export.success", + nbRow, dataModel.getExportDirectory()); } @Override @@ -388,7 +383,7 @@ }; ExportMapUIModel model = getModel(); - displayExportLauncher(_("sammoa.title.export.exportGeoPoints"), + displayExportLauncher(t("sammoa.title.export.exportGeoPoints"), model.getExportGeoPointsFilename(), model, startAction); @@ -419,7 +414,7 @@ JFrame frame = ui.getParentContainer(JFrame.class); Action closeAction = new AbstractAction( - _("sammoa.action.cancelExport"), + t("sammoa.action.cancelExport"), SwingUtil.createActionIcon("cancel")) { private static final long serialVersionUID = 1L; @@ -542,8 +537,8 @@ shp.exists()) { doExport = SammoaUtil.askQuestion( ui, - _("sammoa.messageDialog.mapOrDbf.exportFile.alreadyExists", - dbf, shp)); + t("sammoa.messageDialog.mapOrDbf.exportFile.alreadyExists", + dbf, shp)); } return doExport; } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/region/RegionUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/region/RegionUI.jaxx 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/region/RegionUI.jaxx 2014-05-16 08:08:04 UTC (rev 664) @@ -34,7 +34,7 @@ jaxx.runtime.validator.swing.SwingValidatorUtil jaxx.runtime.validator.swing.SwingValidatorMessageTableModel - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/region/RegionUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/region/RegionUIHandler.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/region/RegionUIHandler.java 2014-05-16 08:08:04 UTC (rev 664) @@ -41,7 +41,7 @@ import java.io.File; import java.io.IOException; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 04/07/12 @@ -102,7 +102,7 @@ JFrame parent = ui.getParentContainer(JFrame.class); SammoaUtil.openInDialog(ui, parent, - _("sammoa.dialog.title.region"), + t("sammoa.dialog.title.region"), ui.getCloseAction()); ui.setVisible(true); @@ -152,7 +152,7 @@ @Override public String importCsvFile(File file) throws IOException { int nbImported = importCsvService.importSpecies(getModel().getId(), file); - return _("sammoa.messageDialog.species.import.success", nbImported); + return t("sammoa.messageDialog.species.import.success", nbImported); } }; } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect/TransectUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect/TransectUI.jaxx 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect/TransectUI.jaxx 2014-05-16 08:08:04 UTC (rev 664) @@ -34,7 +34,7 @@ jaxx.runtime.validator.swing.SwingValidatorUtil jaxx.runtime.validator.swing.SwingValidatorMessageTableModel - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect/TransectUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect/TransectUIHandler.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect/TransectUIHandler.java 2014-05-16 08:08:04 UTC (rev 664) @@ -43,7 +43,7 @@ import javax.swing.JFrame; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 04/07/12 @@ -107,7 +107,7 @@ JFrame parent = ui.getParentContainer(JFrame.class); SammoaUtil.openInDialog(ui, parent, - _("sammoa.dialog.title.transect"), + t("sammoa.dialog.title.transect"), ui.getCloseAction()); StrateModel defaultStrate = getModel().getStrate(); Modified: trunk/sammoa-ui-swing/src/main/resources/logback.xml =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/logback.xml 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/resources/logback.xml 2014-05-16 08:08:04 UTC (rev 664) @@ -49,6 +49,8 @@ <logger name="fr.ulr.sammoa" level="INFO"/> + <logger name="fr.ulr.sammoa.application.device.gps" level="TRACE"/> + <root level="ERROR"> <!--<appender-ref ref="FILE"/>--> <appender-ref ref="CONSOLE"/>