- Sammoa-commits - mailman.cloud.codelutin.com

May 16, 2014

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(a)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(a)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="CONSOLE"/>

1 0

r663 - trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence
by athimel＠users.forge.codelutin.com May 16, 2014

May 16, 2014

Author: athimel Date: 2014-05-16 10:05:33 +0200 (Fri, 16 May 2014) New Revision: 663 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/663 Log: Ajout du persistence context Added: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java Added: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java (rev 0) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java 2014-05-16 08:05:33 UTC (rev 663) @@ -0,0 +1,24 @@ +package fr.ulr.sammoa.persistence; + +import org.nuiton.topia.persistence.TopiaIdFactory; +import org.nuiton.topia.persistence.internal.HibernateProvider; +import org.nuiton.topia.persistence.internal.TopiaHibernateSessionRegistry; +import org.nuiton.topia.persistence.internal.support.TopiaFiresSupport; +import org.nuiton.topia.persistence.support.TopiaJpaSupport; +import org.nuiton.topia.persistence.support.TopiaListenableSupport; + +public class SammoaTopiaPersistenceContext extends AbstractSammoaTopiaPersistenceContext { + + public SammoaTopiaPersistenceContext(HibernateProvider hibernateProvider, TopiaListenableSupport listenableSupport, TopiaIdFactory topiaIdFactory, TopiaHibernateSessionRegistry sessionRegistry) { + super(hibernateProvider, listenableSupport, topiaIdFactory, sessionRegistry); + } + + public TopiaJpaSupport getJpaSupport() { + return jpaSupport; + } + + public TopiaFiresSupport getFiresSupport() { + return firesSupport; + } + +} //SammoaTopiaPersistenceContext

1 0

r662 - trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence
by sbavencoff＠users.forge.codelutin.com May 16, 2014

May 16, 2014

Author: sbavencoff Date: 2014-05-16 10:03:24 +0200 (Fri, 16 May 2014) New Revision: 662 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/662 Log: update version Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightImpl.java Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightImpl.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightImpl.java 2014-05-16 08:00:52 UTC (rev 661) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightImpl.java 2014-05-16 08:03:24 UTC (rev 662) @@ -59,13 +59,6 @@ } @Override - public void addTransectFlight(int index, TransectFlight transectFlight) { - fireOnPreWrite(PROPERTY_TRANSECT_FLIGHT, null, transectFlight); - getTransectFlight().add(index, transectFlight); - fireOnPostWrite(PROPERTY_TRANSECT_FLIGHT, index, null, transectFlight); - } - - @Override public Collection<Observer> getObserver() { if (observer == null) { observer = Lists.newArrayList();

1 0

r661 - trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence
by sbavencoff＠users.forge.codelutin.com May 16, 2014

May 16, 2014

Author: sbavencoff Date: 2014-05-16 10:00:52 +0200 (Fri, 16 May 2014) New Revision: 661 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/661 Log: update version Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Dates.java Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Dates.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Dates.java 2014-05-16 07:37:57 UTC (rev 660) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Dates.java 2014-05-16 08:00:52 UTC (rev 661) @@ -3,8 +3,8 @@ /* * #%L * SAMMOA :: Persistence - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %%

1 0

r660 - trunk/sammoa-persistence
by sbavencoff＠users.forge.codelutin.com May 16, 2014

May 16, 2014

Author: sbavencoff Date: 2014-05-16 09:37:57 +0200 (Fri, 16 May 2014) New Revision: 660 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/660 Log: Modified: trunk/sammoa-persistence/pom.xml Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2014-05-16 07:33:24 UTC (rev 659) +++ trunk/sammoa-persistence/pom.xml 2014-05-16 07:37:57 UTC (rev 660) @@ -116,7 +116,7 @@ <templates> org.nuiton.eugene.java.JavaEnumerationTransformer, org.nuiton.eugene.java.JavaInterfaceTransformer, - org.nuiton.topia.generator.TopiaMetaTransformer + org.nuiton.topia.templates.TopiaMetaTransformer </templates> </configuration> <goals>

1 0

r659 - trunk/sammoa-persistence/src/main/xmi
by sbavencoff＠users.forge.codelutin.com May 16, 2014

May 16, 2014

Author: sbavencoff Date: 2014-05-16 09:33:24 +0200 (Fri, 16 May 2014) New Revision: 659 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/659 Log: Update version and topia 3 Modified: trunk/sammoa-persistence/src/main/xmi/sammoa.zargo Modified: trunk/sammoa-persistence/src/main/xmi/sammoa.zargo =================================================================== --- trunk/sammoa-persistence/src/main/xmi/sammoa.zargo 2014-05-16 07:28:51 UTC (rev 658) +++ trunk/sammoa-persistence/src/main/xmi/sammoa.zargo 2014-05-16 07:33:24 UTC (rev 659) @@ -1,11 +1,9 @@ -PK��;Asammoa.argo�TK��0�ﯰr��l�B��.�bϕO��8��zƱ�8}��JQ5��˞q�u��Aկ��Yu�X)T�:�-��z�0�l�t�;��"1R:��D+�1Cu��}WG+pL�q�r1��!༰Ҁ��7&��U�$��~a��r^0��j�QR�^L��@Y�� t�RB��I8��U�/İ�Ÿ��C��hi! :I;'-�3��أE.w\:H�3|�Z -�-�O$A'�=��=�Ƃ�$V -'b�I'�N��Y��m9��B��(l[-�]�Aޢ� -�P��VS��;M�V�v܀G:AՔ� �x��Z,7�RO��C�W�S�s"�U��Ѽ�Y�L��a� -��,͊�q�2�P�0�=\��m�Z -�U��?֏��2V�� -�k,"X̗��h"�(!�[~�V��_GE~T��q~vx;F��~C��H@-i��pF�*S��:��/��G�64�ur�9=-�+��6�3��P�߷čH.��[�7lM��-=x �M]�um��FWV ��t\�"�)z��U��#z�2Z^ꧺ� -PK��&%K�PK��;Asammoa_Diagrammedeclasses.pgml�]ے�F�}�Wp�0��j�n��-i��^�ʒBj��Ą�M�g�D//�5�?��c[I�n +PK��Dsammoa.argo�TK��0�ﯰr��l�B��.�bϕO��8��zƱ�8}��JQ5��y�̔\7��@T�*{�Uw��Bծ��rK�G�ζJ��,#e��(Ot�#T��weq�'��)c�(��+ +X�}c��^N�q��)��V�7J +_��\(�9��@�PJ�= ��j�V��N��%�C�H�N��I��L<�'9�h��R��Vh��I�Ijì�`O��A4��^�I��*p��G[N�i�P�= +�V�Ch��(`�5��18��!F��NݹU�'��nP5eq&��/��<��-��휈3F��@ o4�|T��jIm�&o�g&��v�e��*��Ǉ��OO+FM݆4F +�2j�-J�☆��y��E�uT�Ge�y��g��}䞽~nh:�B�ӝ�7�_��3 +V��M�w��d��o�zm�j�4�s�%�Ts�m��}I�gi�q{�qi��Xҳ��^[7L��2��ճ-��wc�UY%�]<�q��d�h��G<1�hx��7PK��DH�PK��Dsammoa_Diagrammedeclasses.pgml�]ے�F�}�Wp�0��j�n��-i��^�ʒBj��Ą�M�g�D//�5�?��c[I�n `� pl�� @U�YY�'�^��i�k8_L��{�g�h8��_��%{��^��퇛�?��=�� ދ��r��_��b.��2yZ4_��h�/��N��y��r��/'�_��j�\��L��^��g��0��/��y?x��w��3�?��_l��a��ŋ��k^��ys��d�mo�?��d��w��O��s��O��q��2��s��I��k��9��v!_�_.��2L��k�c:�/�p�_\��!��t�"�<��y=HH�o�k>��x��-��$�~�<�|�/��O�K?��e6��+�L_��_pP�?}�/Gw��o��7_��˒�#V�W<=mv��z�of�_��<p� @@ -83,41 +81,44 @@ yG��Rq��]��R �Ǿc��B��,lQY��9唥�?-3��R� �K�gk�J�n2z�%��ZKִ��Xt�l-��ݽ��݃u��s��[k�ȃܽ��݇u��k'5݉5�2�>�q1��T�=_�D#��B�>0 �sH�g��?mi�?Zл/��܇��}�玞��5�1t��h�v��sw�L��f�A��m�a��w�6�tjHL�SS��_"��r�ɿ?M�|��PK��' -�*ƚPK��;A&sammoa_Diagrammedecasdutilisation.pgml��8��Sx��Tċ(��Tz��N�A�8.�K3.ːTIg��y��ؒ�,�u+�fd7:(ےL�P��_�|XN��Q��3ta�M��<� -V�˳��}�M��ꗗ��oW��z�^��&g��mr{ƏH��y��ja��E��$�� -f�h�p��b��1��b��{��v�Y��|Ę�~E��s��̵,�WK~��>�e��V��,�փ�4�?5��:�_<&�2�g�yg��⧼��y2[-�~v��`am��o�o��kp��_��v��̥�w�r�%Y��0�<�z$��8��A��a��-��q]� -m��_��Lҟx��'��O��Yr�1��K��n��q�G~�|[��3�Wb�܄�*Q��t�w�W�:��9:��of�;�<l���5��J�*�Z9�J�~��/��=W�n>��`KAhCvm>��O2>��g#��lߕ:SחJW�=��oj�GCn'��I�'��ͻ�M\d��'۩��^�k{��N&��U��2\l?��2�_�)��s��-}$��[��8 ��l�W��O�͗��]�x��h�ܬ��z��\&ײ�]�ןtոT��&.��t>q��y�|b�!]Bg*�0v��kA��"��ɷ��Wٷ�^U4+�-�B��{!�A�]Rh��-�f�ד�d;��TQ/�ꥰռ��h�Dd]$��Eo��ʪ�TMԭJ�:��A|^7��Ӧ��r��,J�.r�6 -��v��4��V�0Z�� -�Z)�4C��4� -�} -�L�I}B�=��#�/��ۅ^��E3��)\6҂ÅTZq��O��a+��〕�#��)hR�S\��d�*AZ*��t:8� -u��XE�`��¿�XG~�ŐJD��_��?TC��!��'aI|�W*F�l�-~��p��X,�B5�&H��v��8m�7J�6A"��J��t��D�O(�K"et�p��wyC�A)Ob`cr�{�@N.�r*�(�I�X�}X:�] -h��fv7�!��m�66��ز&ض��g�AH�B&?�"/�V)��ߥ&�|y�_�4]��PFe��'��V�vK�o?�+��JX��b�7��}9.��l*]�Hi5�!G��a!# -2�;�m"#C��R��U��0i��d#Y��HF@L�3� �=<ɼ>^�� -�/�1�h�b �a�9�l��P�d�lEC$��h��#$��E�FO(� -2�� 2T2�b�NZ�{3@��@F��ʾ�q�d�L A��Հ�۪&�Lq� d�J� #��G`��2�vW�UcL��n#+BL5�tX� ��l^�� -�,�^��X��u��u�D-6�P�p��+�*FR�]�.'e�ṿ[�j�F�;Rj��.�L ��Q�]�i��*��Ԓ?��F-��∍$��_G�d��T��¯ZlT��#��f�T��n��i��q��/��ڏ'��j��;��[��?ng��9��7�U�V5�PɩB�c��j��1e?� -a��,�H��*�a@êf�b��*��@S��@��JT�OY��]�&�x��;eX�<cd�0��gL��c*��O�viG�qT�a�"�I�3�p��I�/� aX��6f�t#�iE.2��i@�;Ǎ0�P��$�T��0�qZF�&#Ld;;�b5�z�A�SH��-!�l��^>qR��h:ƿ�#��܋��s��37я�|eM�3��r��1Zpƅ��.��/��Efθ -�Rw�gܡ<|S��3n��N Lƙ��;�L��/;��K��^q�Sq�(��(G�t� )<C��W�%P��q��T0�Xx��A��ǈ��ng�DN�x�dC<PC�S^#��l�g��k R�>R��"�T ɦ��J6:%0�lP�K;��b�Ŏ�c��+�ѡ -�Jl#�K6S��ܜ:�j�ц�Wa��+O�E*��M�9��/�A��3\�`Dc�B�(�ȍ3�h��˫��]�o��^)Lc��ER��ix/��fj 5U=0j��+z@[��h�ʻl �[�i�4}�ᩦ�g8>�)�_&�8-�Սk��DC��ÚR"��V/��mM647�k$�y�� -R��fg�L:�y��-R#��#d(�h23#�t(3�tJ��bf�� ٙ��t�z`�h�3#ڪF��n��m�zڤS�H��#5�3�� -��]�Tu�tp)�[�߰��7�� -�f�6��L��Q��<�¸�x�,��f�N6U=0�epk �N�b��]*�9�F��Nn=�r甎�;U҉��oH�ۑ�fT�UoD��W��mZ�|*��gPl�1Kx�Y��P�xTmC� -��h �d�VxH�F-KuC��zj�ve�R�A%�+�նw�r��a/J!��6�r�4&PF��ŞC�)|$E2��4�K{vLrY0��hÞ�ԟ#��Ar�=�T - 鯪�џ&�`i�N�F�_yz�}pSk��xw~�>��J��5�� -��ZcHM1ȰbA��"2�P�Ɛ�j�QKj�m��IuC�'�6��*c�Vʌ1[6MR��g:d�1dQg��B9D_1��p��RC -�FcT/�F$�"RNW��Pi�}�K�DW�K,o�DbB��"�V&�I�j��v�*R�֘#�m��2�+�ƔqC��Zl�$2�K�ep��}�e�L��RMɔU�D��RM ��|�>K�8�>�aj25% -�1�&35��cj��5��Hj ±�o� ��>�Y�4�wEMfj��K$�CMGD*��Q�UP�)��25��f�� U!b,�=��V�`ا]n*�(��bE]�] u۳�0J��Jd�L��n�9��?�m��,�R��z� -ܯba��Ϭ�4��%�x͗�8��0n��_��w�;#��?�횼i�s~KW��˅_W~1�*�T�E̪%kz��b_��-��m�G*�w��$Xs6�o��|�*s"��e�K��HE.-�׫��j&�:��Sx�W�cG"��L��}�"��o?"=�_b��Ć}�<n�e> {h�f��Z�9��Xw8�,��6qt�#[��ģ}s��EU%}#�hW��G�g�Gsh��r��M~R��厘F��o�4ꎛFߴ��F��v?8��E�F��v?4��FШ#W�޼ҍ��dnEDi��:�:x��דF��F�z4*�qwu��-��hqV��単G߶�*�y�5�V��y�;�hw��7ju��x�;�hw�C�g��}Oꬣ��(�5n��=ܥ�x+�v��Ax��=ڕG��G�4�U��Q�F��(��ˢnƢ�7�6P�P,��v?4�bk�,��X��Ģ��̢�2�E��ƹ��]��ۨT�R>\�R�Ģ}�V��RnU®ve��bo,��7Zˢ�F11�6,�ñ(7�VV��Y�X��Y��E+�s�ó(:�hw�C�(2�Eu�( -��YT��(��L��\�X�o^�X�pgaQ��`W-b�Ƣ��,[x�,Z�)^ñ(7��G��(>�hw�(7��ǌ��(>�hw�C�(�)Y��E1��E��z��}��!X�J�Ѯ,ZD�E�g�,��Ӳl��h�@Wx%�f��1x%'�.~p%�f��1x%'�.~h%?%�j㗰]ǢDˢ�ՓE��E��u}+�hG��1��,��Ӳl��h�0Wx��f��x1x�'�.~p��fQ�A��(=�hw�C�(5�E]��j�Ro%��E++�8��]�o�$x�$�`QO�:ؕE!�E;ղhǼN�/�zB\�Y�5�z��b�,j�X��Y�7��G��}b��fQ��f^B5vQ��}ӆ��K)�.\�.��/0�I��]C�و�C�$��W��vBv�7l��&;�fw��&7l��&;�fw�C�&36��zY�%�,��kM�y��I�]�J��]aS��7�,*V��h��a��qWLj��T1��r��/x�<UL�!~h�4�bRO��頋T�z��v�<L��I��4�Z�Ѯ4*Us��>%S��x��4:�I^{�<��*&�?8��b�ס,8��*&�?4��Q1�/�j31�n�j��P߈��WL�s��{�+�J՜�F� -��i�c�$<�zI^��Txw�$�=��FO��z��F�]/��P� -�FO��z��Fͨ�ԗF��'��$*ujw�~4J_/i*Ř��Tɺ�#�N�ZN��|a��9��q��i� -4��q�K��y��(9�K�!~h%㮗4m��gQr��C��,JL��2J�.��=C��%M�sU�K�ʢR-�}�h�V݃E�sZ��K�vM�g�q�K�6p�`,z��C��,:�zI�E��Y�T/��Y��zI�,��b�&��;=�%%s�aXT -I�`Q%&kW�j9�(�簺M�`U�R��jqͤi��Uxwͤi{�<��j&�?8��fҴCa6p=�L�!�g��Ң4(�v0��O�(�d[��]S+��Z'R�3�'9|M��S�G��T� �7=iNv�M�'�戫"M;��渫"M��i�T��is�U��J��*R�C[?ͨ�d� -S�'F5x��~R\��lm�&�g�&ҷ*R��c>��l�}��+��$�Q�|B��?q�O��2�_ĉ�a�m��N�*�?w�D9�q��X#�}6�ز&ض�� Y��2XǾ,�b��M��N~d$�^u#��4�N��^$��(��y��=��c߽,��'*��D�U��]��&�-�� 2�>��G�q�o!��|��.��6rŗ?ʴ�*��ݏ&��I�V1�y�\\#gE�B��>ס8�O�x\�W<�O�?��B�Ne��L7j��__��KN�I�ZWz�+�V�\��K;�Ѩ��8�*rߔI�O\yCi;s��TDQ/ � �启��*]�+R��Ż\ -�Z�T%�-J�:/ځ|^;��&��r��,J9}J5 ��Q~��d�Њ��z GK�s�^�r��G��T -l0��Vwv4��.S�\��[X��$6��:��q�y� ��k��:=�n^wq��E��Sq��6��R\G[��sk��^�u��nt�-��~�PK -*��QPK��;Asammoa_Diagrammedeclasses2.pgml��o�8��_��t'�)6��i�v�nݤi�N�ʍ���$�@RJ[��6U1��>�'&�on��tE��gC +�*ƚPK��D&sammoa_Diagrammedecasdutilisation.pgml��r�8��S��>%� 9��8��Umn]�I��RS[�L�ܕEI'��{��s��$ �VK" +i*K"i�� +��F��˟��k'a��8C��,g�M��_�}��s��_^��ۿ]��+k5�'|��߯�[g��MzsƏȾ� �Y��jQ<?��$�݄�y<�?H�̦Ip��|�׏Ip�߽]��b�C�"��yd�~}�ٶ��-�<��be��>�8�\�>� +��n�s��i��h��/��)��`�N��E�9�]8��l��w�;]��-�I�.��v��̣�n�łK�x3�Q|q��.L��IG� +��o7�}YLg��7��U�6��gI�7��b��\��C�XMӻOa~Y��E�L� ��*��.��i�Zr��T98o�]��^��_f|�(��n)��+��P�W+��k��:��*�N�`��v�Y�X��DRa +�kse�v�d\��;/�*��nߕ:SחJW�=��oj�GCn'��I�/��˻�Q\��'[��Xm�ݵ�v[{-K�T��m�L3;]D��ga:]��3E��D��G�I�o!��|H��6�M�q,��|}-o��C��b=LW��W/��6r-[�y~}��e��!��7qInq�3��̲��.a4��k<��5!}�Χ��{~��ͷ�aULkc\��\j��%��)p��aI�B#�z1lm�E�$�7�N��-#�#*�"RMQ7u(��<uh�E��r�H.��4N�1~FB��_��f�d�V�U��Ѫ�#��,�_K�UX�c�e2K��3��3�x\�\>��^x �B��#�a�Q�l��4߸�{��}�׳ +VXEm/%~k{1�W{��*7O(�C��INq�&B�Ŭ i�t*��T��|�*&��8L��*.�L"��.�}54��A�ķ}eb�϶��/x�珈�t(�P#:�8�."Z#��F�8c�H렫q|��&�%�zI��t�.�bH (e�9�QL�� L��(�a��>,�q�'��o3�{��w�M��'�m;��?��0)9Ȕg]?W��A��2Y>��OS�.��'# +~2�� +�}6��(��${X +�9t�/�&��u��!�?(��'�UF�#��1Imu�;H��AV��9Ȉa��Q��e�{|�y3\�� +�?g�^4��0ŕR�E�b�J1D��!�ߑ� 4��RL��Ǽe��AVG�s%:ļ��2J��U�!��:�$��C �T-`dC +��rw�_,�e#~��b.�@̡�� SDG�Ş�Q0�� a�Srp��+7��'M?��n��s��΅��#>��.�~)]e��T�E�ղ�j�u��⌟W��J�F�+�a��?��+��⊥#��o��~;D^a*�05Z��jG +g:p\5S=-T�q�rlv�#��:DXu�X7�r��V�=I��}�4��s�P��|�X�t�Q��:_��/)�N� 3l�0�F3U�0�`�xR�f0�$&Vjf�u��R��X� �[��d0U�`��A� +R�K;r��r +��0)��A�`M��d}�M��xd�f�� zy']e��V�Pֲ�jv��^ܑ�K�F/�a�R��ċEvX�;��v��+��~�8Yo�2��k��^�@y��qN��>�f^k��.�- ��F��q��`~��-�#�5�W�]��e��7��X��P�3e�f�2Y�;х�S��~QFE��Hރ��ـ�"vW(_�G��R�iBy�X�/��_�l��2��e8�p��:�b�K��.SA7-T�R�'��g��Q��5�W�� ?��#��j|èF��NX#��Ƅ��f�bN� ��5��0%C��]4�X�۫p�C��:�%Ǹ&�k�/I�j��B��p�rуьܺQҌ�pgiyIU^��gx�F�3��h��"�-�m&�U|�mMx|�)��Mike"��P��ɂ��g�8�)��\��E��#.��A)x-oh��w��-�>4�"�F9��r4�.#I�>�4z��]ɾ�#嘶�d�;�d�,��A�dK��r�͙)�ף��m��S�55{��Kڲ߆ye��o�r�'~ٛN��&i��m·[z��3��V�5��jtv��PL��F1��SL�� +9�Fx66��v��s�;��1}�J�P��z#�܆*7��-��M��N��v�s�1��:aǇ�bG�6�[C�!!��ߑ�Q]Y�=ƒ�R�ک])�6��1\qe��a^�Rړ��qڸ%2�NP��fhÁ��H�O��`i�NRb��h$; +j�`l�gږ�h�=וØ�g�b1@�==T�0��l��WC�Ɓ��Bi9��@8V�0�n Ȩ<G:v9o�T��x��߮?4�C�R4�9J�<S�^:f�0䌢jӗxr��Q��ץ"rFQ6�Q�H��KB�]E2��a��^�]Q-1�u� +��X�H*�V9��[Ԅb��\�m{{ aN�R:LG1$Xڝc<��n@n��g�D�!��]��<2��F�.�}|�T�{T[\�KM��:_~�l�hMn¨5��.U�@��F��&Ԭ9�#j�Q��K�"��i;�Y$c@��a/i ��5�(P��H�^"��j�v��9p�d�T�qĨ�w{�5a&I43 Ƃٓ�!��r�}��&r��/V��R�=��┋��A�T��v��G�ݔ��,��W��UL\��fͥ?�L)�k��&��o~�k��@��_��n��M��[6��_.��bU��2��l长{��y�n8��?,�p��<L��M�V��_/�^"'�4u^-o&�e��O�_� +D�Q�7��3P�\��ŏHO�X��!�a-D�G~w;��h��_O��Z�5GV��g��?��>�0$�g�&��P�(��o�튢W�CQ��YAќ�4$��$��2gy��e�=D=�A�m��A�;�hw񃃨g6�^�O2� �@��A�:��r��+[~�!K�U��X�Z̥��D�n��-*E@��$��A�+c�!@�X�C��Y-��o0��k�K��o4�V��Q�?�hw񃣨o4�z +��P�?�hw�C��?x��D]�CQFk�6[{��'�p; +�J�V��(�{�+�s*4�bI{U�Q��C�a(��P��6C�p_��v?4�b�lm��0��:�"�[<'~M =&��H��5Q��_q�6|� C��I��Ё�P%�jW-�h�� +1��1B#�1�a��"�1�2Vd��脡��lu�'pE'�.~hE��P(��`�v�j��D�) +��о��C��UB +v��"��`��D{`h~Nˌ� +��J�L��b�1�=9C� C��C��ڞ��a��bT��b��Pe �8*�C`�ܣ]1��?��Ot=04?�e�"ch�TVx%fch{j<��v?8��1�=1C� C��C�S�Pm�v�0�h1Ա{bh��:{�P)'C��=�C�bL��׮��X�`�� +��lmO��Pz��Pj4�� +��v?4��c��KQ"~ +W꽡�:ohe��v�+a�bh!�ahîM��q�&옋�~�$Vxu��P�=-C��v?8�:fch{R<�:'�.~hu��m�P�7�h3�)�˕}� �+��r�THyW�,�s��G�wM~g�e��Hz�+��f6g��}�s&;qfw�s&3�3۳��9��8��9� +�3��wY��jM�y� +H��?��F��r�T��`�Yԟ��I-��L��5��T��G~{"<Y��?4Y��QO��/�;��IuWw��,��/e�C��G��T��` ��]��?�;��d.x=�?�!~p5��ߡ�8��?4��Q_�n��xu �j7�G�'��/�C��ܣ]AT��t0m(T��a��O�A��G~{:<��?8��]��Pb +DOՏz�D_��/�R]�NV�ђ(��9�u��(9~��E�e#�At"Uf:��sJ��i��Տ& +��0��]�hҞ��T��1��]�hҞ��T��1��(E��y;=1��Տ&R9�*[G튡Re�Cah=�C�sZf,��M:$��c��Տ& +H�7=U?�!~p5��ѤC�5p=U?�!~hi��z��tk7Z��!w{V?"ʶD��P)�C�ԫ]1T��HV_u]��|��#jp�I��Tx5�Ҥ==EO�z�Eͮ�4�Pf +EO�z��9��O�d;��J��/��غʙ�SS�9ڀQ�s�%r� +G)�5'r�vEM��0j��:v&M�G��5�&�U�A��G��/x�<�8�!~p�4��ѤC!5p�<�8�!~h��k9N��<)�Yzg�vs&��L�o��$��l�=��g��gV�Q��E��o +��" ^&iQ�}| +�o�K>4�2��: +��r0�A��F��b۶�� Y��g�b��@z��:L��"�,5��H��>uV��|l��"��Di/�[�-�I��_A9��N�~��m-�,�V��ђ��tͷ��߇.�%�-nJ�k&῅��!I��p6][�%��xc��Al=,�4�.��ꅸ�F��S��܆��?��'l�K��e�!]�v*�0f�ak9��*�>\p2�O�'�ҳ\ɶ6��?��*a�n�jmYou�[�tXE��H�^��ӵ�"�! ��7yg�V�T#�MJ�:O�q|Q��q��/��~5�SM��0��Q�_F�Fg�d�VlUM@N��߿ h��&�9~��U{�$��U{S&��|�#��8��Z9�)��^5�k�i��޼j�Z9=��U3�VΛ�"x�کVN�C{�FP+G[��j" ��]�uq��iLh��PKC)�$[QPK��Dsammoa_Diagrammedeclasses2.pgml��o�8��_��t'�)6��i�v�nݤi�N�ʍ���$�@RJ[��6U1��>�'&�on��tE��gC Y�3'��3o(�8�3e��h��_�O��7|��$��Md��\��؉�9KZ#o`G^��J�5�m/��w��Y�p�"��?��q`��ɲ�{��=]�H�Mt�T�Z�n�6:�3E9P�yGJ��=�Cy�֔B�$��Nc �;#�u�E�b��x�{Jzk{��Ą�*Vv%U�w%�Ю��6��8�C�b�:f4�!��>�*��9�l��q��X��ʳ�^Fԅ��̬�h�p�A ��K��X~��˒U�q`;��Qr�p�W6��,��g^@sc1�F�f(�7ӳ[8S��ڟ�ˡ>NK.��]��iIɮ:��%�ް|�Q�è�a��a�:��V��ÒĻZU�3�h$��gv�;C9 ��p�Ro3��i�?��K��p�߶r`Y~��iK .�1�Q�oć��b�J��k��0NUC�0Z�U��n嬴S�<ȽW1 �!Y��D�2��z�+,��Ʋ��ud��f��Zi5Z�T[��*`��J}v�ʃ3xD��pԐ��D*&b#S��Rs��y�૭�$]��l��r��.�eS�q8��/��ܾ��2K�Ϻ�8ڦ�c�d��KnXҀ��^��h��٬ R� @@ -125,89 +126,98 @@ 8 ��R��E�H�(tX )q��Ed�b賀��S�3��aHi�lޔj#��h*�� Bz�)��jo�O��)\�RF�J�Jz�x�OT=�,u>�&㔁J�jQ��5}0��@�@U��({R�I��(�,U��n�'e�=EL�Y�>0��b��Я*6�,��}ZS\OS�h�ŔG��QGA�jWE��S�RK�RY�ȳ�4�,!M��LSj��>��2M��gWυ�>C�B� ��V�#�m�6z�9H�O��:_˪��H�O��5�Y��NL�XJ-�M��1Q��-kV�j[l��̝��Z�t�5/�t">�W�!xg;>�CJ��DېN�6�qvϞ<��.˒�'��I�dP��I��q��9��Z�oG6ko��1��vx�.8�|��"r�y1�c�K@`�_�Q��>(�3��_�f�Õw8�ATM!μ�W�|$_"[Vmp�9��=�)�g��wޮM��G� �o.��Ѩ��d��&��S>h�Ӌ�Ƚ��0WG�G]0}p�p�yܶd��,�M�+�B��4��]}М��X��m�� -�&=��i��6��s��Fm#M�F۰��Nۤ��Ʀ`n��s|��~gm�=��i��6��V�V�6�Զ�wm��ңI��w�6y�`��?PKɟ��FAPK��;Asammoa.todoeO�j�0<�_��.YnkW6�M��{��Xk#P�ERL?�5%Ѕeg��aV�/�,`�ƙ�H�3��Tz��ٝ�HɾI��Н?�ģBҞ��J�H��*%a%�u�|�� +�&=��i��6��s��Fm#M�F۰��Nۤ��Ʀ`n��s|��~gm�=��i��6��V�V�6�Զ�wm��ңI��w�6y�`��?PKɟ��FAPK��Dsammoa.todoeO�j�0<�_��.YnkW6�M��{��Xk#P�ERL?�5%Ѕeg��aV�/�,`�ƙ�H�3��Tz��ٝ�HɾI��Н?�ģBҞ��J�H��*%a%�u�|�� ,��\�l�v� -l�:�L�A;��Nx�{�i7��D�7��=�l5�^8�0�@h�@��h^PZ��ˢ��CYV�j*8�5��ӓ��LB�l�)�?�~�$?PKP��KPK��;Asammoa_profile.profile��Q(K-*��S�UP2�3PRH�K�O��K ��Z()��qq��e��qqr�䔦g恘��> +l�:�L�A;��Nx�{�i7��D�7��=�l5�^8�0�@h�@��h^PZ��ˢ��CYV�j*8�5��ӓ��LB�l�)�?�~�$?PKP��KPK��Dsammoa_profile.profile��Q(K-*��S�UP2�3PRH�K�O��K ��Z()��qq��e��qqr�䔦g恘��> �z& Q}�0� -��b<��SR�S�R�K��+�,EȂ9PK8��7y�PK��;A -sammoa.xmi�][�㶑~ϯ�Ir<�ٴZ7�2N�#�ՓٝK{��>�@$�f�"e^ڞ<��ط}��i��?�_�%�E��o�{� ��W@U��6�'츆m)R^tZ� -�4[7��ŏ�W��y�Z�um�bͻ/��L�}��7�7��j��U�6��3ȏZoh��G_��;T:��n_��n��}��o�~��e��nk�[��U��v<�v�lJ�׾K��{�,W��c�&р�h��u�7�?m��n��_�Q�d�XW�~�<��ݾjw�:��}�m��!�k+_��?(��7��7��1̀�5&��ul*!��[2��˟~�i�{��M;��l�#�ݽ�t}�6z��S�^��P��m�F��Qu^^��3�/v|�$ѷܣ��F/ý�`�XZ0��%2]L��/�`�|��;Y��,��h�Q��=o��E�Z�3��?Rn��&v�nІ��6��p��tv��]��^�OwY�M��1��&r��<u��ы��bt��m��ݽ�|em�X1�Q�iߖuf7r��Ͼ�A+��v� -rm(��U!�O]e��Y��q#�&n� -؇e��'JƗ�+�%_��O��32 -7X3�"��v\%�)��|K��}3��V�:�+^.ɔ~�h�Q�W_��J7Ȼ�W,�W�z=|��)�E+�D�IW�K�1��5^DT}��d�ֹ$п�D�=+"��`�Ċ�Q�!�1�Vt�%��ʎ�z4Ȟd�Y�<٦��I/S1L��'�T��#�&_��(��h��G�wHo��wmlB��/��G�- -:� -�7�)��g��tڿ|~�� -B𚯱��A��[4�l�?��Nk}��g -��!��8DfB#̉ІL��[�e,|��O��ٷ�o?��?��sbAO�m��s9��*�T�|� -�O�l�1� ��R^��'2oڭ��ٚFV��Q=�ɱB�l�*�Zh��+d�]L'ұ7D�u_!�5n�@ˌ�y��!4$� -�z�?D��HnV'��R4�K��1\px_�a;G��D}hi]�Wؾ� -�֯u�� -��t7��Vc��!�Ȏ��R�~�'��Hq7��d��X�>��{W D%��>Rtd�ʲ��2�;��x�2%%�7��i��r�3akC��G��0&��"��91j8��s��>K�?K�=�*��>;X#m��2��vɖo� -�e��}�|��&w?~�s�r}1Rg<R��D�p�|��h�-)Ltu�חL��N��ٛ�_��ٿ�кŶ�"�h�'L&�4��m*Y��"_�Nk� �88e�'��|��tƱ��x�f��7��~��d�� #6��44�(�;�� ^C�3�j��)-8�症�0�k<䬰�|O�);��{��!�v˾��7=cC�%�gu��{��e�I�S-�6�9��\��>��9��W�P��&�7�v$^�*ٚ9�קMf�x�6i��7�C��=z��5>�_�-�Y]�s�� Ƿk�N�Z�KDh��zBԥ��a��X��$n[Gk��1#�=��u��ׯ&�?�@]O&��޿{��C)h��W.�=�tOQ��3[�7lS��U��m�-0�Qo�Ymr�ԝ1�+�6q��'��U)�4��3�-��ĵ4�tr_��4��m^?��P��2ؐ&��?3\�׵5#��#<k��/콡�P'k�1��-�ܡ3��}��&޷r8:vv�x��u��j��U�R˶8� -�I$��gZk��7�В딓�,�Ƶ,e�� L)!��rIf�1q?�M1�1q+b��!"��<�=:�$P$ڤ��D�\��,qlk�6�1��h�;jW�6!-�K=��:W]Ϙ'q��k��Ͱ��xr��q{O_�[g�4座��Q�lp��X��ADoe�V\% N �Z> -<��tA�;�R��ؾ{؋e��-�^��y؋U�Vֽؼ�F�y3�"��;O8��=T��捴��؍YVE|�T{E|��"��0�I�� -3R�8so�m�p!a�k3�#��/��n��`t{�x'Pǡh��*�:��v^v�`z*�M��O˩Ȅ��)۰i�i��6�z�0qP��i;�Is��@K��;�%��_�I1zX�@�}$|K��Q��m<��^��6�33T�^_�(��3�3Sj�E*��$�yA��L{ݱ_Vg��-�^|�%��N\[L�0ybq��}A)|hd�|Q�G K�(5�u��K>s-S#3��^�M��Ť�&O,�h��i�Qn��hd��s��&=�b�U1;��8��9��N5��[F.�q��:8.��kC��`�a)!��G3�igȧ�.)=�WK ��0�U�-ݤW�-��H�@l��Prٰ��jk�"&uK�!>r��q��5,&fV�>��Y81�_�@H�q��s��}�a0HѾ��z�Nq��V��$Ly�GT�[[��d4a�:Y:��Y��Xn�ʾ�P�$��ʳS*@��Q�4�E�� -��)z��Ԫ��a�P=j��x8�O�ܢG�'B��UjeXZL�IQ��m�+|�s��R5j�H�a�Z�{�7��B0 rͭѶ��;��P�Z��])'��&|��X�- Lf̐��h�,�,�)(Q?L��ʞ+uV�kưC��í4��+�"�)��j��S��?ӎXv0��kF-'t�'� -��H��Sr 芹��7�j�ݑ:@�q��p�S��0�$�@@V��Uk��=��p��iX4��|��?��d5��$�w��)~DO��7q�y��H�]�� J��'��(�� -K�kɅ��n��D/�ε(U-/17��r|v��٥!2��m��a�@ɽJ�t=��Z��EaJ��X"��J��"��8P^�Z\�9J��J��ʷ��M��}�;ʈQW�/�H�1�}�R��h�@��T -�/��F�j8�>i��J*<N��C"�(��Wؾ��S�� 6ӑ��lG0�`6�a괘�2��1oÅ�J�3�)ӑ�i[+��u�)��c��<��lPA(`Z�#( �@��#�Xn@�Z ��Qm�Ll9HL��xZL2+ �J4 -��c��&�Ђ�L� �0�X�z#��C7��r��^��nP�� -m(�7�D�$�Z̶@�<��:T�BZ�n&�D%)~��;O��`+0�i�� -�t��*At�>^v1��>�ڝa1%K`Xy��VX^��%�"��l0RB� -�dr7��e��ym�xo��Q�m1q��P�MB��>7�`N�4�! sV-y�� -��iо0��!ll��;��8��̈��i -�{[ �[d��B б6�V& �K�)U'N3�a�4 �i�� -@@��%��=��v�ռ��񡀛�N��YL*;q� �]� � nT�b{�և<�R<-y��:��w�\g��1��r�8 ��'A�C��ʁH�!� ��2-&z@�>��u��n@X&�ܜ��G۳d�YLB[q� �m�C{�!��[9a�o��V�-��p&�X�o��%+7�'��'dpQ��@��fc�O�`��AGt�Z;�j��b�ә��n�� B�؃�Ȓ,-&�P�@#�u�,�$��(�!��ՄL�e�t9b&�}�Sn��`P�b��g�3� |��0j|�Tǝ�h��E�P�l�2��UT6�{� ߭O��0}L�A�4�H� �i�t -M�>8?�:�ofܨS�d?1M��`VP�0}x�P@d�o��0d�YP��0}n�Pc��"�-�f�2g� -�<c��&A Q�u��wI:H�p��i�w�){�ȳ�a�w&��b��郸�X��@Y��NG�C/��'m(��Ib�N��e�b -Ia�H\�ƌC�f�͑�?Q�Ϗ$ -X��L��%',��5�$*.��`��H�` !�#֡�E��b�f斄;��X0�0��O��>�{"�]� -:��Em -� �MA�CeͶ;�ߓIB{�g��q��F�rH�b�.�h�wuv�:n61��OY�c�V��p��i]4��|ǡ�-�[��튁̣�@��S�k�M��7u�y��]��)��p�L��x��Ѱ��\��次��+aJ��;עT��ܤ�f{��cd93s�_�1��0L��϶�Ԃ�v�1o��ZW��y�mI�Ӧ(5:&��%�&�L/wFW˅�;32��+�� -rS�A2y��N�@HN�P�CfF�\óo�_�b��X=��%6IU�q�c�Q��X��e��;O��0�b��`0f��:��p�kna;B�� b�ۉ��b��V,�7�_� ׋��Y̅Bq��>a��@ *�X��̶��"��a�d1�q�X8$�e��#H��i@�K{��}.|��9��-\��=tʍ�#A�� -��A��X�z#�Uo�4��<��B��r1W��+9�GK?%E}��@��!�51�/r�h��0�8Z��8��ido(P��Ђ��v��(�ׂ"��ȂX�z��łyt��c� -dx:(90�Q�O��D��x��^��@��U��2��:� -��gQ��}Ra��0Soʽ'�3CJ§y@P��AIRO{��!��cͳ�,n�ө�uUS)��E��|��Q��j��:TVg��%1e�Y�=I�@0(�:�8 U<��<"T�:;�Ŭ��p��u�l�I�gɞ:£��,�Q__�S�$"Z��$�,�Β�>K�O6��A[Ȱ��8}��u��Q\&��#i~�z�HI�S�G�>��Pc �NO��M��yZ�th3��8@d�[�c��p@��T��q�:�$��r�6�M�t�s�Y�@��PY��"z�b8@#z�u��)G*M,��0��C�1��f�X�o�e�y�-J�J�a��,�>Հ��)��s�sNJ�T�oyW�8lgۿ�]Viڛ��S��|!�w��,f�+A �rc��-��P - ֡��/��7\@�P9Yv�� -�:TsSP�so��^D�ͦ�|;H�p��i�w��ԝ��7��pR�17�=�{e�Y��cHh�PM'x��;ڠ�өP�4U�wC�P�p�Zy��R-�J��p'$�!{U�N^��/�R-��+A 8zc��[�[:��?�f!N T��u�B�/rEw�8 �Ѣ"�� X��t{�@9~S[�@��Pk��DƜ�آ�@�@��X�zGƈ{j�Nk�`�O�V?(�h1Nq��g�P�\ĝ> 4� -i�Ѱ?0� -�٥��3G�ͣ��t�+��[Ba� -b�Y�&�P9�� i:��5�գ|��[��3 -��,�!j[�}�R�vo��)�}��;�[E�!�Iqt� 8�=��~��xLwGC��1N��n"5�~�/\�<a��v -��_� -5}R4%y�>v>�ɲf[��8t�C>��'�4�y4��>B�%U��=�jm�CXD��wa�s�(��N�� QoG�Ѱ��\��Q�}=��d��s-J�A�� -��?7�h��#˙�[�:�g�τ�n��϶�Ԃ�v�1_�A��ֱ |[�KIde-��8}p�6֡�fQ��3�^�x��LC��?g冁>3�4|�VP�yh��l]�8ZLZq� m�CՁ��Ae��?h��נ�>T��!E|j�lH�e?͸�}��V�R��R��a�v��ށ��k��o<�W�ܕ�:S��܃Z��jL݉�@��? >7��)�&�(��{�nW��vg��l'6�2A� �赕MD}�ⳒZq��xIz��f-H�qo�$��9<z��ۂ,�!\|��B"'�kk{�#��Phd��t�Ci��Ƌ -yn<'�z�Й�@��h��f��1��o?a��9�Z9x�Բ-��<JU#q�q��J��E��s]�#��J��H� -b�ڌ:�2a��e� ��L��0�` �K�ӊd�* D�$1� D$ڤ�9-O؆ -��\�UZ)w�/{�.bm�;�A�2\�]��șvW؄ �?дe��b�X�ط^��(N�X�l�d23nhNq[0q�`&��X�QL�q��@d��KU�x� -{�p��x8��p��1P��ș�w`�%��|�)�p�0}b��^e�_��r��%��x��:��@��VA��u�c -ڼ��U\ ��533�_P6Dq�y0��%�K��%@��E|\H�U#�Q~BRVE�IM�UE��8{E|[vE��LP��SGx4֖��,�Q_g�u��!��L"��3�Ý.�a��f�b3/��e��b�@��F@h�1��x�y��k˱�2�t�j1��K��D�l�-��2\f��W�)e��\�/Ux}�k)?%��N��'JQ�:d_^�{��E��!�{��P@��݂.��(v�P�I(��f�2��ր�r�R�?ѧy8�K�nFI��K܇U��8:(;0� -�@Ac��x.Pm�`[ �Ҳ��h��,h,pk�X�I�SNF�@�'�PY,�"�Z��v�}��7�X��V&��<L'󳘰 �f��i��2-N�5(��I��e7'��(p�6��l� -�ZL]b �0q�C�PPASR�[�[:�4K�Iu(A`ER�� -��C��dB��ڠ˴j�U��֐9sp�� -d�Z�A�>8�:T�:q�fe�j��$J�^�Ƣ|��l��BvZ��l#�k��k�� -��md�k��w�D��,.�a��N�x�Q9/͊F#sH]�j��A,�.�gU�� -�f3��떷D|��L[R�d�yI#�V�� I��E��e��I>�΄,�3��5�� JE��LY}{-�l��ۻ7sKR��0��?N�� -�Q�'��W��s]��gC��g�,��P}�S%��,�FY-�<�� `��ș�ڠ�3w��(��Q��Xlv��:��g�;��\�ΘɅAj�Ɋ*a��ƚ��%]Еq�R3��=)�YX\2�0�5B�t��T=�U�x��t�7�c��Q�� U��j4��┳B��o�� -�tli�Z�i`��V�%�(!��D'��N -��-2�%�2��^L�&g'��⚯0'�� ,�s,��0'�'@�Y��Y]��K��h�]��6�Z��\4L�)=�̔��O�4�흫"�k0gR8a�� -/pE�=Cn�� -��]8��Χ��ds��C��?�D� -d�G�l?p��[��Z�kJd�M��VT��.ls�d�&J'��(��!"�9�ŢƗ�3|�Z�ă��+��v��Y�ɛC��ĸ�i�2;�q�=d�Prӡ[��!��*�҂��crIvȽ*��%�#:Y\.�� -��@+��ŧcZ��2�ã�)��Z��~'��n��-ن -�b��Q|��l<k�#�� ƃN9�ASGs��[a�oc��Ӓp�02:�'*��|G4��!��Ew��Έ��.�jh�>��q�I��#�9s�Gd �{]�T��xZ��m��=A 6�VB� -�{�K�fS�}�m��n�Ұ�nCu��rf31�Qm��U�^23��jM2!}��==��z|�W� a�<��sf��I|m�!��-��^/��XِuA�LqтXY#��]��D1�B��O!�C��4dj��`K٘�K_�a��2��s>ÁN��|��^� -{��l�#k�`��,��P -�M3�p��G鈵�SQR�O�9��3�}|��s�e�~$H'&ˆ�Ff�O8�ڃe�3�2=��ű�m-��ܭ4Dݘ[��:��ω��l��Ǭ��ݫK$��黳��p<��ل5�W_>��- -�� -ZY�J|>#��JR�1�k`�@}��zC�ai{$��%'�/��?��~r�/� -��X��\~�\�dj�h�)O�Y�1 -��;2C�D�%�"�n%�W -A�HD��M'+��R#[J�l��l͊�{d��S0��I�1�n:5�҃�A��Lp��C�g�}ր�ت -c��mh?��e�'�'+��F��9a8djû�K�e�`��w{/e��}�!�$��y��׉,�@��6q7�r.��AҮ�ĪH��dx��U��~�� bWgg�� 9�8��i}�-r&��6w�d��'ˌ��+\��̐��To�d��ꊜ��]��.�#�(q��b�r��#��ș��n��9�oW�9��s�� --r2� -�E��.�&#g�@ms� 3�6 -9��"g"�Ks�L��Q�̐s�4�d��9� -��d��(�:d��늜��"g�cs�L��s�¨Cf��{�5E�1�.C]�s�H��%�d�Ga��N"�m��"g"wVs�L��Q�̐��ɼ�U[��Q9��(�:d��b��FNfҙ�"'\�{��`�Ga�n_�*D�DI�EN�v�ܡ�� ¨�!:q�f2��"��=wh.rN�Qu�,*�Q��L0W[�kw��(�:d��7MCNf��"'\��|��C�U�ܡ"�ˆ��9�kwQ��!�*|��(��$��yh��޷~�K(;G��pє͓F�ϛ��5CL��u�jg@P��*�x��]�F[��2cX� ��({��-�y�喎<��;*kQ}H�� X�4YxP�f�u��'��r�ܾ ��Tn��/o_S��o�PK�9��%P,PK��;A��&%K�sammoa.argoPK��;A��' -�*ƚ�sammoa_Diagrammedeclasses.pgmlPK��;A -*��Q&v-sammoa_Diagrammedecasdutilisation.pgmlPK��;Aɟ��FAaCsammoa_Diagrammedeclasses2.pgmlPK��;AP��KsJsammoa.todoPK��;A8��7y��Ksammoa_profile.profilePK��;A�9��%P, -MLsammoa.xmiPK�[r \ No newline at end of file +��b<��SR�S�R�K��+�,EȂ9PK8��7y�PK��D +sammoa.xmi�]ے㸑}�W0��X�JR�{&$��ݻ}��{� ��H +/5�~��ط}t�i�a�O�K�D�(� Q�-OW@&��@f"��'�z�c+T^tZ� +�u�0�%�ŏ�W��y�Z�ue�ͻ/��,�{��7�7��l9�e�6�� +{k��7ɏ>Z�i�?cCy�>)U��_��Te:�P��( +�^�#��)��g�у�}� +h��/�׵��]:��ٞB��k�&��h��u�7�?m��n�ԯ��(.~2=B?yÿ� ��D��ڝ�NG�v_v�/ɰ��|�ֱ��f�(��$��>��O�a��0�c`K��ߒ��vw^��NK��w�7m�Swl��w�J��u�Niwpվ"C��q��v^vz}<Z�=�yy5l��/ۻϰ��D�r�V+�PL�~�usa��P��0��x��7��x��.�w�ƳD�.�2�3��ƍ�Ί��q�'��k��H�m��Z�S��Iz��Z;޷��S��w��/��y�.�-d��Z��t��1��/�d\�ёhw�O��(+'��2L�趬�0��/��5Zb�q7��hM��ů +��(�dL{e��5qCV�.�(k<Q2�|^� +�ʗ�.V�/��ez��6Y(��)!L��W��٫��_�bA��E' +��W�I�E�b��z��뇰�D��N�/Z�'��Yt�zd)�<��I�AH��K�l�I�L4ߓ�$R� +��ɨ,�x:��S�q1n�0=��l٨�G��I6��ʓc)ݯX��"ݬ/�x"HE:<�`��z��Q��~��&�+|��!�菈~��y��¤s��yS�i��?�N@YL��/�� .��E��1��7��L��ݑ��#��8�Qv��L�91ڐI�\�~#t��E��v��W?��2��X��ζ�8�39��*�T�|rL�O�l�1� ��R^[�'2o.ڮ��w�9�NV��S=��{�F��?��!� +�zӉt�5�v#P�|�[%�2��w^ڢ�z +a��Uh�gv3��8��B�Nu�f5F�j��o��=�� +;w�I��ׁI��h��=��!��:�q�Z��/�$��)�٢�Kײ�r��֜,��'[;�*��ewx��Y��G��No8ZhLII��0�p[�嶼�L�Z�c��*s>LH`��=#��;tN��lr�v7��˒��zO�*��8*?��H[�� k�]��M�SY3٧z�=f��Ïf�\_��)��w�?��.��z��!��n� +Uc��O_��u2��l;(ҩf�D�񸝅w�Me!?TC��m-0�g��]sN�#�ݡ�G�Q��8ִ��f�ƿ��P�LϜ�d��}�:�[��cEr�^w��k�y�GT�0>��y��%��I3e˖{� +t�6d�n��Z�o� ��n��u�٩,�0�c~��f5gt�@۟J 7��r~!�^��J�^G�f@Ж�k�A�[3��̐��:��4Q�;�G�_��&��+��kr.Y��vM~�Q� +�@��'D]*�k��l�e��M�u��z3δ�8��#��w}3�}(��ô~x��O� ��#��)��W� �gf��m��J�c��ܱ�&? +� +;��o��5�aEݦ�ۻ��*��~F��t�u��F#>��K��F3��R�=X޿yW�x4��~:��g�~�y�n��Sv�h�'-s�3�dc==fV�m�:t�aW֞az�B7��»V��6/�ß��Z.]��_j;6Ǹ�5�d�z�Lk��c��[�� q-K��E��yB=QJ�!��B��mL�}S�mL��$g�x�H�:Oq�. �6��'��x�:�5FO�A��X��Վ�թM�@��Ȱ�NFU��S�I�q��x|3(�6�0!zbm��W�V�9�)M�(�t�Cc1�\�"֝U�[�W��ȴ�EO�=g��M)�bl�=��rߋݖ}/��<D��*r^+�^l�\�Ȭ�F��c�lXr��`��~��a�F��j��,�"��"�e��^_�D��$�Fe��)H�� +xL��2�5��k�Ǘ�i�K~0��Q��H4��*�:��vVv�`z*��M��O˩Ȕ��)۰I�i��6�zx?qP��I�Ɠ��Aw��)w�<��_�q1zX�@�}$zK��Q��m<Q3/��^��Ɨ7��j�<��R#z�(RG�Y@��K +ɤw��e�p�A�"��G^�� +�a�ĵ�D��'7*��΁��/ J`\�(aif&��r�v�g�ejd�؋� ��%��8�<<��&�+#�VA�d'W��*f�҃#��s1gbq��P�ש��z��疑�f(�N�7E��Ч�:`XJH�E.t��-<A��) +�KJ��-'<�oUrK7�{K�.5=[},�\6��Z��I�R��2��u +��O,dN��s ��8NF�9\��.N0dh�[�\>�ǸP3+D�GHO�_�<��c`k[2��r�.�̬D��SL,7Ye_D�I��d�9 i��A��QVJ��=��Uj5m��G��Qg4٧�[n�#�!w�ڀ*�2,-&ݤ(}�6ӎ=�Dt��ϱ@�ƽ՛S�Z!��h[��]��c�X-�ׂ��L=�C��V��SfHO�j��w�� +{��&��eϕ:��5c�!\p��V��i��i5z{�)y�IG,;@��P�5�� +��d�6�Y�)9t��U��kn��P��(�G�5m0��n�i" ��̪�uc�|�~>��~��iXt��Ŷ��?��Md4��(�w�� ~DO��3qk��H�]�� J��'�ń(��M��iɅ��n��9�^��kQ��Z^bn� +�s�ǫ��옗��KC�>3�&RKm�%£vL}cn:}*�î�.�H�1M�*�&�֛&�S_U�>慝��R5L(�?�� +$M9i#�x��;�<; +�$h�K^x��&��ƃ��S'Ť��yo z@_T�x�L�&�,�^�~`H��A��O�p�,�� +B�VCY��,� � +�� ͝cf +� +�PpO�I�!A�X�-��7(�[c��r-( G�@�It�7 <�:t�8j/��Lw��hM��p ��b�� ѡ��u3I]��3��{�}:.ֿ�K��I�s��6h�Oo��˙��T��b��G*�۝A1%K`X7X�V� +�ɘ%�"��l0�<�%_�dr7��ymyÏ��m1q�༐�P�MB��d� GE��9��<�@�H�D�4h��^� +֎qo�\ +R�ʍ}fDr�4�-�-��LX�K�@��*z ��܄@h �͒gIC�D�j^W��P��R�,&�8}��'��7�`��n@F@)��X� +j��C��\ݘ�R^�b�� ѡ�Fq�� +$Б��=��= ND$:�x7 ,n��;�2�,&��8}��/��{��RN9a�o��V�-��p&�D�o�k\�'��'d�pQ��j�o N3�Vҧy0P��U��]��3�w1��h73n��-��mdI�E(A �&:TJ��r�Y�zs��c�鲬�.��$�q�)ۤ9��,��Q�ϐCfHA�4Oa��:��7z��e��1�=i��A�[9�v��a��f��h$p��A�,-��0}p~Lth�L�Q�� 6�~d*�C��Sa� �4��7��i��p3a� �,ѡ� Qߏ[<�rtdM]y�SCM�@(��PY�"t��a��}lt�){�ȳ�i9w&��b��郸�D��@Y��NRG�}/��Gm(R��qj�M��e�b +Ia�H\�ƌC�f�́�?Q��$ +X��L��%',��5�$*.��`Ì��H�` !�#ѡ�E��b�f斄;��X0�0��GO��>�{"�]� +:��Em +� �MA�CeͶ[�ߓIB;�g��q��b@�b��hht +v�:n61��Oy�c�U��~��i]t��ץ�-�[��튉��@��3�k�I��3uk��]��)�g��h�\L��y��Ѵ��\��次��+aF��;עT��d�f{��óc�933;X%1��3L�g��M��k]e�ѷ%0��ܖ��L3u��]-L��\��8R�*�MM�h�ZLn: !9]�C��9]q +ρ�%��s�(o��$U�9[��Y�F!��jl~�Y��<�o��@��r��y,z��s� L�s�O�)o'N��Kt�r��,�~�\/��g1 +��Xh\c��{S�6B��|J�:��[��@�� +X��@d�iV�!��W� ��r,�4f��i��`�g�ַ�0��17J�j1.��F��z[�y(��6�1�b�q��r�qL��W +1'Bjb �_�/�� +aJq��q��< ��P�U��! +��'�GQ��E��>#��蘀�[�Y��_r(`��AA��)J�b��`5c�[��-Ld*Mt�3[��8�S�5a�ޔ{O�2CJ��y@P��AIROz��c�w�,n�ө��k�RB�b��w�B�^8߰y�gk1��Zx��bnga�g�#Dp`CILY~cO� J�5HOt�.�U�NNq1-�()A �%*r޳dO��H_Py��P5�)��(I��n��ϒ��uD�r�2�,�!N8 j�u� n�H��߱��)R��j�$:��=g��n�i��<�.7':��X�N��i1�8��b�5��ܻ�`S>��p� �8':T֦,��6�ѐ^u��H�.�bq��L�1I1�3�8}`&Ht��@\&�W��@�v�J�rl�P +(I��ʊ;�}��DI��3�v��e�&��_9�p��rw�P)��b6��.7ѡ�*.�Jn0~��b�H��m��eg10 N�@�C57�9��.�E��@��l�ɷ��~��0��P�c��y|��I��+�Β'�AB�D�j*8�S��A��k�ڙ�Bqýba{�? +Hq��+!�D��q`XA�:yɺs��Hq�?��Mt�VnMl�r�,��8�P�"�P� +�� +��G��&"�2S��YLAl �"v�C�Q@8>��s<c��a�#��: +��:&kX��@��8 +��A�C�swT�Gh��{Á:�3� +�إ��3G�� +�+��[Ba� +�Y��̡r�RҴ*wk��G��ϝ3`�2�n��u��mPx�5Juֽ��ES6�T��;�[E�� Iqt� 8��~��hDwG�i�ΐ�n"5�~��=�>a��L��ɧ�_� +5}24%y�v?�Ȳ��z�t�CC>�9 �4�u0��>B�%U'�=��j��KXD��wQ�S�(��M�� Q6oG�Ѵ��\��q�]=��x��s-J�^�� +��;7�x��3ϙ��*�'�Ϙ�ng��M��y�=~Z�!�m/�,i$��983��D��D�Be^�� Y��~N� +*3�4z�Vиyh��l]�8ZLZq� m�CՁ��Ae�S��r��z_�l�5�x�0��dH��2Rβ�f\K�?zy��Di`U)��0w;��lA��õG +�7�U7w��4�E{��}<��.�3w�%Pk��Mf�@J��) +){jO�v +ʉ��kw�s]e;��א R��D��|"��`p��̊�%�K��Ï6kA2�{;'qX�,��]�d��u�g&�υ�/��?�9�<G79�+��GB#�%�8��J��u^l�s��'L|GDcI�7�� i/�;� �ϡ��cs�@\�Q�I2��+h�x�$�DP��.��T��O:�+�f܉o +� ��d(c��H0�%'��{K�]r��T$�UI B&��!"�&sϑjy�6��\�h��a{��t�)�p�wa�#g�]a&��nw��h��o��)P�>�p=؂�:d��М�`��L;��/X��-p_�B�B��`8d3�6�c��/�3��K^��|SL�a��nM��F��KS��}�U�=�eu�Uo�t��,�ڨ��Y;ea��z��k-,jff�ZP6Dq�y0��%�K��%@��E|XH�U#��,��5q��83�>��0�� +�p�/��۟kC�`�u��!��L"��s�Ý.�a��f�b3/��Ge��b�@��w�� ?��h�y�V��HcN:]��e�S�f6��I.��}}�K�2D.�/Ux}�k(?%�� N��'JQ&:�_^�{��E��!�{��P@��݂.��(v�P�I(��fҲ��ք�r�2�?ѧy8p�� +��Bs��q�_v(`��B��\��^¶@��e�=u��@�X�X,�֒ ��,-��PO&ѡ�X�G��<�K��:�)Z��S�<LL75x��g1a 2͈��<��eZ��kP�4?�nN�9)�P�`m�9^�6�^�1��Ba�D�� +i��P�� 8h�vwʄ��~�i՘i|O��#k��p��8}p>Ht�lu�󚕅�]w3�(�-g^��5c��isc��!u�FD׊�׊ߛ9��fE�ĉ�Y+&�Y\*��,ɝ8�:��r^��F携8>�Z��A,�.��U�� +�fs��u�[">�f�-�q��sI#�V��Vɢ�)I��E��i>τ,��p��)�� JE��X};-�l��ۻ73KRu2�a�7��ȑ��lO5;b� q�n��$��.+XL� + ��^�J&1:H4��de�<�]KY+��G��5��Ӥ�FQ +��{��b��fv8��ݨ]8��`��Q?��wFL.�3sNVT K�k�9ZX��]�'P,5#�aɌ�㲞��%��F��r��[��]L7|#��Πǎ��T�yߍ��.;��m`[��-3��aU��O�Gti�f��&_ =N��lr��,��q��E�>�0�&̩� f�|a��m��u)�-�c�fWk�� >�'��q�� Y��sU�} +�L +'�y��g�M�cz!��y��~��i�/ٜ��R��|Y�Q2��}�� ~$�g��}f��ڜ:��ң q1!��q��i;-�F��n�}��%�%q�e��Jjv7]�u�u��PWwt�ZfG�?��n:t�B?wR�XZP>tq!z��Y�r� +�{I��N��-uӻ��,�ʧie��V~�h��q��P��t��P�P�Uw6��'�t�]T~>a�ٸ��f��\4�VX4�ۘ)$��$�?��|��?�#�[Mݢ;Xck�}nm5�h��$�$�a��9�'2�׽�C*}o<�9��&�͎�DF+�W�LD��S�'��6{��7xa�f��3�d��9��q�(��M/�EXџ�jM:!}��=;��z|�W� a�ܓ��sb��qrmg!��1B-��Y�]�XY�uA�L�тXY!;��]��X��Bk��v\_!�C��td遥`[Y[�G_�c��p��r>ǁN��ә� +�� \��#{�`��v��l��P +�Ms�p +��n��H��SQR�O��Y��s�}|��q��~$H'&��NfR%C��B팺L��?dql��s�D&�+ +Q7�mG��s��|%>�k�?�d��I +x��d��O>s6f��՗�t��j��Y%�<#��RR�1�)k`�P}��zC�ais$��%'�/��?��}��/� +��X��׫��\|�\�dj�x�)O�U�1 +��;2C�D�%�"�n%�W +ALH�� +��R'[J�l��l��{`��S8��I�1�n:u�6A��Lp��C9πUր�ت +c��c�i?/��e�/�'+��F��9a0`jû�K�e�`��{/e�s�!�$��y�;�Y؁,�m�n��\B�sI��R�"e��Y��WQ��}��Tr��AR�� ڹA��q�匜L�Cm�3��K&'�̼8Yf�L]�j�䆜��z#'�DVW��B5w�49��[X��ܐSmr��"g*һ�K&�̾]]f�L��6W�B��Uhِ��V�-r�.�5w�49Sj�+�!�i��t}�9S�]��d��(�;䆜�!'3�șJU��%�d�Ga�!7��L?XW�d��9S��d��#p�r�e��)r��wꊜ�T��.�&#'8 +��t�1o��9S��d��(�;䆜�D��FN�%��"��9Ga�!7�d�7r2��9��s�#'8 +�p��X!b&J�-rµ�� +FNp��ё3�y�9�p��Cs�s�¸CnQI�"X�FNf��"'\�{��`�Ga�!7�ir2��9��]�K��s� +�;T$�`ِ�Q�9�p�.�P�@�s� +�;4 +9sI�=f��&�l��N�ѝ/\4e�Q��&p+�Cs��,�J8\�u[��1��6~BVpj�^,v�w��e ��Z\��7,M��Yz��6��]��n_��*p;��T7�!��?~��PK~��P�%z%PK��D��DH�sammoa.argoPK��D��' +�*ƚ�sammoa_Diagrammedeclasses.pgmlPK��DC)�$[Q&s-sammoa_Diagrammedecasdutilisation.pgmlPK��Dɟ��FA�Bsammoa_Diagrammedeclasses2.pgmlPK��DP��K�Isammoa.todoPK��D8��7y�Ksammoa_profile.profilePK��D~��P�%z% +�Ksammoa.xmiPK��q \ No newline at end of file

1 0

r658 - trunk
by sbavencoff＠users.forge.codelutin.com May 16, 2014

May 16, 2014

Author: sbavencoff Date: 2014-05-16 09:28:51 +0200 (Fri, 16 May 2014) New Revision: 658 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/658 Log: Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-16 07:27:24 UTC (rev 657) +++ trunk/pom.xml 2014-05-16 07:28:51 UTC (rev 658) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.11</version> + <version>5.0.6</version> </parent> <groupId>fr.ulr</groupId> @@ -89,7 +89,7 @@ <distributionManagement> <site> - <id>${platform}</id> + <id>doc.${platform}</id> <url>${our.site.repository}/${projectId}</url> </site> </distributionManagement> @@ -101,28 +101,33 @@ <properties> - <platform>forge.codelutin.com</platform> + <platform>codelutin.com</platform> <projectId>sammoa</projectId> + <releaseEmailDomain>forge.codelutin.com</releaseEmailDomain>  - <nuitonUtilsVersion>2.6.11</nuitonUtilsVersion> - <nuitonI18nVersion>2.5</nuitonI18nVersion> + <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> + <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> + <nuitonCvsVersion>3.0-rc-1</nuitonCvsVersion> + <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> + <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> + <nuitonI18nVersion>3.1</nuitonI18nVersion> - <eugenePluginVersion>2.6.2</eugenePluginVersion> - <topiaVersion>2.8-rc-1</topiaVersion> - <hibernateVersion>4.2.0.Final</hibernateVersion> - <h2Version>1.3.171</h2Version> + <eugeneVersion>2.9-SNAPSHOT</eugeneVersion> + <topiaVersion>3.0-SNAPSHOT</topiaVersion> + <hibernateVersion>4.3.5.Final</hibernateVersion> + <h2Version>1.4.178</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <jaxxVersion>2.5.18</jaxxVersion> - <swingXVersion>1.6.4</swingXVersion> - <xworkVersion>2.3.12</xworkVersion> + <jaxxVersion>2.8.5</jaxxVersion> + <swingXVersion>1.6.5-1</swingXVersion> + <xworkVersion>2.3.16.3</xworkVersion> - <jodaTimeVersion>2.1</jodaTimeVersion> + <jodaTimeVersion>2.3</jodaTimeVersion> - <slf4jVersion>1.7.3</slf4jVersion> - <logbackVersion>1.0.6</logbackVersion> + <slf4jVersion>1.7.7</slf4jVersion> + <logbackVersion>1.1.2</logbackVersion> <i18n.bundles>en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> @@ -158,8 +163,20 @@ <dependency> <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + <version>${nuitonConfigVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + <version>${nuitonDecoratorVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>${nuitonCvsVersion}</version> </dependency> <dependency> @@ -183,13 +200,13 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>${nuitonValidatorVersion}</version> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>${nuitonValidatorVersion}</version> <classifier>tests</classifier> </dependency> @@ -197,6 +214,12 @@ <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> <version>${xworkVersion}</version> + <exclusions> + <exclusion> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </exclusion> + </exclusions> </dependency>  @@ -226,6 +249,12 @@ <dependency> <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-config</artifactId> + <version>${jaxxVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> <version>${jaxxVersion}</version> <scope>test</scope> @@ -283,6 +312,12 @@ <version>${hibernateVersion}</version> </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-csv</artifactId> + <version>${topiaVersion}</version> + </dependency> +  <dependency> <groupId>com.h2database</groupId> @@ -331,7 +366,7 @@ <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.8.3</version> + <version>1.9.1</version> <scope>compile</scope> </dependency> @@ -339,7 +374,7 @@ <dependency> <groupId>com.bbn</groupId> <artifactId>openmap</artifactId> - <version>5.0</version> + <version>5.0.4</version> </dependency> <dependency> @@ -405,7 +440,14 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> - <version>${eugenePluginVersion}</version> + <version>${eugeneVersion}</version> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-templates</artifactId> + <version>${topiaVersion}</version> + </dependency> + </dependencies> </plugin> <plugin>

1 0

r657 - trunk
by athimel＠users.forge.codelutin.com May 16, 2014

May 16, 2014

Author: athimel Date: 2014-05-16 09:27:24 +0200 (Fri, 16 May 2014) New Revision: 657 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/657 Log: test commit Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-10-24 08:53:13 UTC (rev 656) +++ trunk/pom.xml 2014-05-16 07:27:24 UTC (rev 657) @@ -527,3 +527,4 @@ </profiles> </project> +

1 0

Build failed in Jenkins: sammoa-nightly #1
by admin+ci-codelutin.com＠codelutin.com Feb. 17, 2014

Feb. 17, 2014

See <http://ci.codelutin.com/jenkins/job/sammoa-nightly/1/> ------------------------------------------ [...truncated 2674 lines...] <div id="members"> <ul> <li><a href="http://www.easter-eggs.com/">Easter-eggs</a></li> <li><a href="http://www.codelutin.com/">Code Lutin</a></li> <li><a href="http://www.entrouvert.com/">Entr'ouvert</a></li> <li><a href="http://www.ldd.fr/">Les Développements Durables</a></li> <li><a href="http://www.nereide.fr">Néréide</a></li> <li><a href="http://www.syloe.com/">Syloé</a></li> <li><a href="http://www.labor-liber.com/">labor-liber</a></li> <li><a href="http://www.cliss21.com/">Cliss XXI</a></li> <li><a href="http://www.silecs.info/">SILECS</a></li> <li><a href="http://www.libricks.fr/">Libricks</a></li> <li><a href="http://azae.net/">Azaé</a></li> <li><a href="http://www.scil.coop">SCIL</a></li> <li><a href="https://www.cadoles.com/">Cadoles</a></li> </ul> </div> </div> </div> </div> <div id="warpperhome" class="clearfix"> <div class="menu"> <div class="rightmenu"> <ul> <li class="level1"><div class="li"> <a href="/accueil" class="wikilink1" title="accueil">Accueil</a></div> </li> <li class="level1"><div class="li"> <a href="/nos_metiers" class="wikilink1" title="nos_metiers">Nos métiers</a></div> </li> <li class="level1"><div class="li"> <a href="/nos_valeurs" class="wikilink1" title="nos_valeurs">Nos valeurs</a></div> </li> <li class="level1"><div class="li"> <a href="/references" class="wikilink1" title="references"> Nos références</a></div> </li> <li class="level1"><div class="li"> <a href="/le_laboratoire" class="wikilink1" title="le_laboratoire">Le laboratoire</a></div> </li> <li class="level1"><div class="li"> <a href="/contact" class="wikilink1" title="contact">Contact</a></div> </li> </ul> </div> </div> <div id="warpper2"> <div class="maincontent"> <div class="margin">  <div class="page_left"> <h1 class="sectionedit1"><a name="cette_page_n_existe_pas_encore" id="cette_page_n_existe_pas_encore">Cette page n'existe pas encore</a></h1> <div class="level1"> <p> Vous avez suivi un lien vers une page qui n'existe pas encore. Si vos droits sont suffisants, vous pouvez utiliser le bouton ou le lien « Créer cette page ». </p> </div> </div> <div class="right_sidebar"> <div class="main_sidebar sidebar_box"> <h1 class="sectionedit1"><a name="sb_right_actualites" id="sb_right_actualites">Actualités</a></h1> <div class="level1"> <p> <div class="news"> </p> <ul class="rss"><li><div class="li"><a href="http://www.codelutin.com/blog:news:salon_de_l_agriculture_2014" class="urlextern" title="http://www.codelutin.com/blog:news:salon_de_l_agriculture_2014" rel="nofollow">Salon de l'Agriculture 2014</a> (2014/02/03 14:56)<div class="detail"><div> <p> L'application Agrosyst, développée par Code Lutin, sera présentée lors du salon de l'agriculture 2014 par l'INRA lors de son colloque intitulé “Conception et adoption de systèmes de production agricole à hautes performances”. La présentation aura lieu le mardi 25 février à partir de 16h30. </p> <p> Agrosyst est un système d'information permettant à l'INRA d'identifier les pratiques culturales innovantes permettant de maintenir des rendements élevés tout en diminuant de 50% l'utilisation de produits phytosanitaires. Toutes les composantes des systèmes de culture y sont répertoriés afin de pouvoir comparer les différentes pratiques et mettre en évidence les plus efficaces. </p> <p> Vous pouvez assister à la présentation en vous inscrivant sur <a href="https://colloque.inra.fr/sia2014_agricultureperformante" title="https://colloque.inra.fr/sia2014_agricultureperformante" rel="nofollow">le site de l'organisation</a> </p> </div></div></div></li><li><div class="li"><a href="http://www.codelutin.com/blog:news:bonne_annee_2014" class="urlextern" title="http://www.codelutin.com/blog:news:bonne_annee_2014" rel="nofollow">Bonne année 2014</a> (2014/01/13 10:25)<div class="detail"><div> <p> En ce début d'année 2014, toute l'équipe Code Lutin vous souhaite ses meilleurs vœux. </p> <p> Que cette année à venir soit pour vous pleine de promesses et de succès, tant professionnels que personnels. </p> </div></div></div></li><li><div class="li"><a href="http://www.codelutin.com/blog:news:balle_de_match" class="urlextern" title="http://www.codelutin.com/blog:news:balle_de_match" rel="nofollow">Balle de match</a> (2013/11/18 17:22)<div class="detail"><div> <p> Code Lutin était partenaire du match de championnat de France Nationale 2 de Rink Hockey du Nantes ARH ce samedi 16 Novembre. L'équipe du NARH recevait le leader du championnat, le Biarritz OL. Le match s'est terminé par une défaite du NARH sur le score de 6-5. Les bleu et blanc n'ont pas démerité puisqu'ils s'inclinent sur un but a 50 secondes de la fin du match. </p> <p> Code Lutin a offert la balle de match et plusieurs balles distribuées aux spectateurs durant la rencontre. </p> <p> Le NARH est actuellement 3ème du classement et possède la meilleure défense du championnat. </p> </div></div></div></li></ul> <p> </div> </p> </div>  <h1 class="sectionedit2"><a name="sb_right_articles_techniques" id="sb_right_articles_techniques">Articles techniques</a></h1> <div class="level1"> <p> <div class="article"> </p> <ul class="rss"></ul> <p> </div> </p> <p> <a href="http://www.codelutin.com/blogtech" class="urlextern" title="http://www.codelutin.com/blogtech" rel="nofollow">Tous les articles</a> </p> </div>  <h1 class="sectionedit3"><a name="sb_right_actualites_des_forges" id="sb_right_actualites_des_forges">Actualités des forges</a></h1> <div class="level1"> <p> <div class="article"> <div class="actutitle clearfix"> <h3>Code Lutin</h3> </div> </p> <ul class="rss"><li><div class="li"><a href="http://forge.codelutin.com/news/259" class="urlextern" title="http://forge.codelutin.com/news/259" rel="nofollow">Tutti - Tutti 3.1.3 released</a> (2014/02/13 17:04)</div></li><li><div class="li"><a href="http://forge.codelutin.com/news/256" class="urlextern" title="http://forge.codelutin.com/news/256" rel="nofollow">Tutti - Tutti 3.1.1 released</a> (2014/02/04 13:32)</div></li><li><div class="li"><a href="http://forge.codelutin.com/news/254" class="urlextern" title="http://forge.codelutin.com/news/254" rel="nofollow">Tutti - Tutti 3.1 released</a> (2014/01/30 20:19)</div></li></ul> <p> </div> </p> <p> <div class="article"> <div class="actutitle clearfix"> <h3>Chorem</h3> </div> </p> <ul class="rss"><li><div class="li"><a href="http://www.chorem.org/news/58" class="urlextern" title="http://www.chorem.org/news/58" rel="nofollow">Pollen - Pollen 1.5.5 released</a> (2013/12/23 15:16)</div></li><li><div class="li"><a href="http://www.chorem.org/news/57" class="urlextern" title="http://www.chorem.org/news/57" rel="nofollow">jTimer - jTimer 1.4.3 released</a> (2013/09/27 07:50)</div></li><li><div class="li"><a href="http://www.chorem.org/news/56" class="urlextern" title="http://www.chorem.org/news/56" rel="nofollow">Bow - bow 1.2 released</a> (2013/09/25 05:32)</div></li></ul> <p> </div> </p> <p> <div class="article"> <div class="actutitle clearfix"> <h3>Nuiton</h3> </div> </p> <ul class="rss"><li><div class="li"><a href="http://www.nuiton.org/news/529" class="urlextern" title="http://www.nuiton.org/news/529" rel="nofollow">nuiton-maven-report-plugin - Nuiton Maven reports plugin 3.0-rc-1 released</a> (2014/02/13 17:43)</div></li><li><div class="li"><a href="http://www.nuiton.org/news/528" class="urlextern" title="http://www.nuiton.org/news/528" rel="nofollow">jaxx - JAXX 2.8.1 released</a> (2014/02/12 18:27)</div></li><li><div class="li"><a href="http://www.nuiton.org/news/526" class="urlextern" title="http://www.nuiton.org/news/526" rel="nofollow">nuiton-validator - Nuiton Validator 3.0-rc-1 released</a> (2014/02/12 18:04)</div></li></ul> <p> </div> </p> </div>  </div> </div>  </div> </div> </div> <div class="footer"> <ul> <li class="level1"><div class="li"> <a href="/tarifs" class="wikilink1" title="tarifs">Tarifs</a></div> </li> <li class="level1"><div class="li"> <a href="/remerciement" class="wikilink1" title="remerciement"> Remerciements</a></div> </li> <li class="level1"><div class="li"> <a href="/offres_de_stage" class="wikilink1" title="offres_de_stage"> Offres de stage</a></div> </li> <li class="level1"><div class="li"> <a href="/equipe_de_lutins" class="wikilink1" title="equipe_de_lutins"> Les lutins</a></div> </li> </ul> </div>  <script type="text/javascript"> var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.codelutin.com/" : "http://piwik.codelutin.com/"); document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); </script><script type="text/javascript"> try { var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 1); piwikTracker.trackPageView(); piwikTracker.enableLinkTracking(); } catch( err ) {} </script><noscript><p><img src="http://piwik.codelutin.com/piwik.php?idsite=1" style="border:0" alt="" /></p></noscript>  </body> </html> does not support Maven 3 at org.codehaus.mojo.sonar.SonarMojo.checkVersionRequirements(SonarMojo.java:126) at org.codehaus.mojo.sonar.SonarMojo.execute(SonarMojo.java:107) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 19 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException Sonar analysis completed: FAILURE Build step 'Sonar' changed build result to FAILURE Build step 'Sonar' marked build as failure

1 2

r656 - in trunk: . sammoa-application sammoa-persistence sammoa-ui-swing
by maven-release＠users.forge.codelutin.com Oct. 24, 2013

Oct. 24, 2013

Author: maven-release Date: 2013-10-24 10:53:13 +0200 (Thu, 24 Oct 2013) New Revision: 656 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/656 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/sammoa-application/pom.xml trunk/sammoa-persistence/pom.xml trunk/sammoa-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-10-24 08:53:04 UTC (rev 655) +++ trunk/pom.xml 2013-10-24 08:53:13 UTC (rev 656) @@ -15,7 +15,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> <modules> <module>sammoa-persistence</module> @@ -78,12 +78,12 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-1.0.2</url> + <url>http://svn.forge.codelutin.com/svn/sammoa/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-1.0.2 + scm:svn:http://svn.forge.codelutin.com/svn/sammoa/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-1.0.2 + scm:svn:http://svn.forge.codelutin.com/svn/sammoa/trunk </developerConnection> </scm> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2013-10-24 08:53:04 UTC (rev 655) +++ trunk/sammoa-application/pom.xml 2013-10-24 08:53:13 UTC (rev 656) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> </parent> <artifactId>sammoa-application</artifactId> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2013-10-24 08:53:04 UTC (rev 655) +++ trunk/sammoa-persistence/pom.xml 2013-10-24 08:53:13 UTC (rev 656) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2013-10-24 08:53:04 UTC (rev 655) +++ trunk/sammoa-ui-swing/pom.xml 2013-10-24 08:53:13 UTC (rev 656) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0