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

r430 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/sammoa sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa sammoa-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 18 Aug '12

18 Aug '12

Author: tchemit Date: 2012-08-18 10:08:55 +0200 (Sat, 18 Aug 2012) New Revision: 430 Url: http://forge.codelutin.com/repositories/revision/sammoa/430 Log: improve export (add success dialog message + ask confirmation when file to export already exist) Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapModel.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/sammoa/ExportApplicationService.java 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/sammoa/ExportApplicationUI.css trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUIModel.java trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapModel.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapModel.java 2012-08-18 08:05:22 UTC (rev 429) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapModel.java 2012-08-18 08:08:55 UTC (rev 430) @@ -34,7 +34,7 @@ import java.util.List; /** - * Model of export map. + * Model of export map operation. * * @author tchemit <chemit(a)codelutin.com> * @since 0.5 @@ -81,8 +81,8 @@ return exportDirectory; } - public String getExportFilename() { - return exportFilename; + public File getExportFileWithoutExtension(String extension) { + return new File(getExportDirectory(), exportFilename + extension); } public Campaign getCampaign() { Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java 2012-08-18 08:05:22 UTC (rev 429) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java 2012-08-18 08:08:55 UTC (rev 430) @@ -55,7 +55,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; @@ -78,19 +77,19 @@ protected final DateFormat timeFormat = new SimpleDateFormat("HHmmss"); - public void exportEffortsMap(ExportMapModel dataModel) { + public int exportEffortsMap(ExportMapModel dataModel) { Preconditions.checkNotNull(dataModel.getCampaign()); Preconditions.checkNotNull(dataModel.getBeginDate()); Preconditions.checkNotNull(dataModel.getEndDate()); if (logger.isInfoEnabled()) { - logger.info("Start EffortsMap export to {} :: {}", - dataModel.getExportDirectory(), - dataModel.getExportFilename()); + logger.info("Start EffortsMap export to {}", + dataModel.getExportFileWithoutExtension("")); } long startTime = TimeLog.getTime(); + int nbRow = 0; // * uniquement pour un parcours de type LEG, sinon la cellule sera vide // ** uniquement pour un parcours de type CIRCLE_BACK, sinon la cellule sera vide @@ -175,7 +174,8 @@ List<Route> routes = flightService.getRoutes(tx, flight); // get all geo points for this flight - List<GeoPoint> geoPoints = flightService.getFlightGeoPoints(tx, flight); + List<GeoPoint> geoPoints = + flightService.getFlightGeoPoints(tx, flight); // get best geo points for each route Iterable<GeoPoint> routeGeoPoints = @@ -225,6 +225,7 @@ record, builder, graphicList); + nbRow++; } // reset effort group @@ -275,6 +276,7 @@ record, builder, graphicList); + nbRow++; } // keep current route as previousroute @@ -289,24 +291,27 @@ flushExport(builder, dataModel, graphicList); - timeLog.log(startTime, "exportEffortsMap", "after EsriShapeExport execution"); + timeLog.log(startTime, "exportEffortsMap", + "after EsriShapeExport execution"); + return nbRow; } finally { endTransaction(tx); } } - public void exportObservationsMap(ExportMapModel dataModel) { + public int exportObservationsMap(ExportMapModel dataModel) { Preconditions.checkNotNull(dataModel.getCampaign()); Preconditions.checkNotNull(dataModel.getBeginDate()); Preconditions.checkNotNull(dataModel.getEndDate()); if (logger.isInfoEnabled()) { - logger.info("Start ObservationsMap export to {} :: {}", - dataModel.getExportDirectory(), - dataModel.getExportFilename()); + logger.info("Start ObservationsMap export to {}", + dataModel.getExportFileWithoutExtension("")); } long startTime = TimeLog.getTime(); + int nbRow = 0; + // * uniquement pour un parcours de type LEG, sinon la cellule sera vide DbfTableModelBuilder builder = new DbfTableModelBuilder() .stringColumn("REGION") // (campaign.region.code) @@ -524,6 +529,7 @@ record, builder, graphicList); + nbRow++; } } @@ -534,25 +540,27 @@ flushExport(builder, dataModel, graphicList); timeLog.log(startTime, "exportObservationsMap", "after EsriShapeExport execution"); + return nbRow; } finally { endTransaction(tx); } } - public void exportGeoPointsMap(ExportMapModel dataModel) { + public int exportGeoPointsMap(ExportMapModel dataModel) { Preconditions.checkNotNull(dataModel.getCampaign()); Preconditions.checkNotNull(dataModel.getBeginDate()); Preconditions.checkNotNull(dataModel.getEndDate()); if (logger.isInfoEnabled()) { - logger.info("Start GeoPointsMap export to {} :: {}", - dataModel.getExportDirectory(), - dataModel.getExportFilename()); + logger.info("Start GeoPointsMap export to {}", + dataModel.getExportFileWithoutExtension("")); } long startTime = TimeLog.getTime(); + int nbRow = 0; + DbfTableModelBuilder builder = new DbfTableModelBuilder() .stringColumn("REGION") .stringColumn("CAMPAIGN") @@ -610,6 +618,7 @@ record, builder, graphicList); + nbRow++; } } @@ -620,6 +629,7 @@ timeLog.log(startTime, "exportGeoPointsMap", "after EsriShapeExport execution"); + return nbRow; } protected void flushExport(DbfTableModelBuilder builder, @@ -627,12 +637,13 @@ EsriGraphicList graphicList) { DbfTableModel tableModel = builder.getModel(); - String pathFile = new File(dataModel.getExportDirectory(), - dataModel.getExportFilename()).getAbsolutePath(); + String pathFile = dataModel.getExportFileWithoutExtension("").getAbsolutePath(); EsriShapeExport shapeExport = new EsriShapeExport(graphicList, tableModel, pathFile); shapeExport.export(); } + + protected void fillDateRecord(Date date, Map<String, Object> record) { record.put("DATE", date); record.put("HHMMSS", timeFormat.format(date)); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/sammoa/ExportApplicationService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/sammoa/ExportApplicationService.java 2012-08-18 08:05:22 UTC (rev 429) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/sammoa/ExportApplicationService.java 2012-08-18 08:08:55 UTC (rev 430) @@ -31,7 +31,6 @@ import fr.ulr.sammoa.persistence.SammoaDAOHelper; import fr.ulr.sammoa.persistence.SammoaDbMetas; import fr.ulr.sammoa.persistence.SammoaEntityEnum; -import fr.ulr.sammoa.persistence.SammoaPersistence; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.TopiaContext; @@ -107,14 +106,14 @@ File csvDirectory = targetStorage.getCsvDirectory(); - TopiaContext tx = persistence.beginTransaction(); + TopiaContext tx = beginTransaction(); try { exportReferential(tx, csvDirectory); exportData(tx, csvDirectory, campaignId, flightIds); } finally { - persistence.endTransaction(tx); + endTransaction(tx); } compressZipFile(model.getExportFile(), @@ -138,15 +137,15 @@ } TIME_LOG.log(startTime, "exportApplication", "after Callback execution"); - } protected void exportReferential(TopiaContext tx, File csvDirectory) { + DbMeta<SammoaEntityEnum> dbMetas = persistence.getDbMetas(); + SammoaEntityEnumPrepareDataForExport prepareDataForExport = - new SammoaEntityEnumPrepareDataForExport(persistence, tx); + new SammoaEntityEnumPrepareDataForExport(dbMetas, tx); - DbMeta<SammoaEntityEnum> dbMetas = persistence.getDbMetas(); MetaFilenameAware<SammoaEntityEnum>[] referencialEntries = SammoaDbMetas.getReferencialEntries(dbMetas); @@ -232,12 +231,10 @@ } }; - public static void compressZipFile(File zipFile, File directory) throws IOException { - compressZipFile(zipFile, directory, true); - } + protected void compressZipFile(File zipFile, + File directory, + boolean delete) throws IOException { - public static void compressZipFile(File zipFile, File directory, boolean delete) throws IOException { - FileUtils.forceMkdir(zipFile.getParentFile()); try { @@ -249,15 +246,15 @@ } } - protected class SammoaEntityEnumPrepareDataForExport implements PrepareDataForExport<SammoaEntityEnum> { + protected static class SammoaEntityEnumPrepareDataForExport implements PrepareDataForExport<SammoaEntityEnum> { - protected final SammoaPersistence persistence; + protected final DbMeta<SammoaEntityEnum> dbMetas; protected final TopiaContext tx; - public SammoaEntityEnumPrepareDataForExport(SammoaPersistence persistence, TopiaContext tx) { + public SammoaEntityEnumPrepareDataForExport(DbMeta<SammoaEntityEnum> dbMetas, TopiaContext tx) { - this.persistence = persistence; + this.dbMetas = dbMetas; this.tx = tx; } @@ -269,7 +266,7 @@ @Override public <E extends TopiaEntity> List<E> prepareData(AssociationMeta<SammoaEntityEnum> associationMeta) { - TableMeta<SammoaEntityEnum> tableMeta = persistence.getDbMetas().getTable(associationMeta.getSource()); + TableMeta<SammoaEntityEnum> tableMeta = dbMetas.getTable(associationMeta.getSource()); return getEntities(tx, tableMeta, "size(e." + associationMeta.getName() + ") > 0"); } 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 2012-08-18 08:05:22 UTC (rev 429) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java 2012-08-18 08:08:55 UTC (rev 430) @@ -42,6 +42,7 @@ import fr.ulr.sammoa.ui.swing.SammoaUIHandler; import fr.ulr.sammoa.ui.swing.util.SammoaUtil; import jaxx.runtime.SwingUtil; +import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.swing.OneClicListSelectionModel; import jaxx.runtime.swing.editor.bean.BeanListHeader; import org.nuiton.util.FileUtil; @@ -286,9 +287,21 @@ ExportMapModel dataModel = model.toModel(model.getExportEffortsFilename()); - // launch export - exportService.exportEffortsMap(dataModel); + boolean doExport = checkFileToExport(dataModel); + if (doExport) { + + // launch export + int nbRow = exportService.exportEffortsMap(dataModel); + + SammoaUtil.showSuccessMessage( + fileChooserUI, + _("sammoa.messageDialog.map.export.success", + nbRow, dataModel.getExportDirectory())); + } + + } catch (Exception eee) { + ErrorDialogUI.showError(eee); } finally { SwingUtil.getParentContainer( @@ -304,6 +317,20 @@ startAction); } + private boolean checkFileToExport(ExportMapModel dataModel) { + boolean doExport = true; + File dbf = dataModel.getExportFileWithoutExtension(".dbf"); + File shp = dataModel.getExportFileWithoutExtension(".shp"); + if (dbf.exists() || + shp.exists()) { + doExport = SammoaUtil.askQuestion( + ui, + _("sammoa.messageDialog.mapOrDbf.exportFile.alreadyExists", + dbf, shp)); + } + return doExport; + } + public void exportObservations() { Action startAction = new AbstractAction( @@ -330,9 +357,20 @@ ExportMapModel dataModel = model.toModel(model.getExportObservationsFilename()); - // launch export - exportService.exportObservationsMap(dataModel); + boolean doExport = checkFileToExport(dataModel); + if (doExport) { + // launch export + int nbRow = exportService.exportObservationsMap(dataModel); + + SammoaUtil.showSuccessMessage( + fileChooserUI, + _("sammoa.messageDialog.map.export.success", + nbRow, dataModel.getExportDirectory())); + } + + } catch (Exception eee) { + ErrorDialogUI.showError(eee); } finally { SwingUtil.getParentContainer( @@ -376,9 +414,19 @@ ExportMapModel dataModel = model.toModel(model.getExportGeoPointsFilename()); - // launch export - exportService.exportGeoPointsMap(dataModel); + boolean doExport = checkFileToExport(dataModel); + if (doExport) {// launch export + int nbRow = exportService.exportGeoPointsMap(dataModel); + + SammoaUtil.showSuccessMessage( + fileChooserUI, + _("sammoa.messageDialog.map.export.success", + nbRow, dataModel.getExportDirectory())); + } + + } catch (Exception eee) { + ErrorDialogUI.showError(eee); } finally { SwingUtil.getParentContainer( Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUI.css =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUI.css 2012-08-18 08:05:22 UTC (rev 429) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUI.css 2012-08-18 08:08:55 UTC (rev 430) @@ -44,6 +44,7 @@ #exportButton { text:"sammoa.action.exportApplication"; + enabled:{model.isValid()}; } #exportDirectoryFileChooseAction { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUIHandler.java 2012-08-18 08:05:22 UTC (rev 429) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUIHandler.java 2012-08-18 08:08:55 UTC (rev 430) @@ -47,7 +47,6 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; -import java.io.IOException; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -132,16 +131,24 @@ @Override public void propertyChange(PropertyChangeEvent evt) { - if (ExportApplicationUIModel.PROPERTY_SELECTED_CAMPAIGN.equals(evt.getPropertyName())) { + String propertyName = evt.getPropertyName(); + + if (ExportApplicationUIModel.PROPERTY_SELECTED_CAMPAIGN.equals(propertyName)) { Campaign newValue = (Campaign) evt.getNewValue(); onSelectedCampaignChanged(newValue); - } else if (ExportApplicationUIModel.PROPERTY_FLIGHTS.equals(evt.getPropertyName())) { + } else if (ExportApplicationUIModel.PROPERTY_FLIGHTS.equals(propertyName)) { Collection<Flight> newValue = (Collection<Flight>) evt.getNewValue(); onFlightsChanged(newValue); - } else if (ExportApplicationUIModel.PROPERTY_SELECTED_FLIGHT.equals(evt.getPropertyName())) { + } else if (ExportApplicationUIModel.PROPERTY_SELECTED_FLIGHT.equals(propertyName)) { Flight newValue = (Flight) evt.getNewValue(); onSelectedFlightChanged(newValue); } + + if (!ExportApplicationUIModel.PROPERTY_VALID.equals(propertyName)) { + + // validate model + validateModel(); + } } }); } @@ -182,15 +189,59 @@ try { ExportApplicationModel dataModel = getModel().toModel(); - exportService.exportApplication(dataModel); - } catch (IOException e) { + boolean doExport = checkFileToExport(dataModel); + + if (doExport) { + + exportService.exportApplication(dataModel); + + SammoaUtil.showSuccessMessage( + frame, + _("sammoa.messageDialog.sammoa.export.success", + dataModel.getExportFile())); + } + + } catch (Exception e) { ErrorDialogUI.showError(e); } finally { SammoaUtil.updateBusyState(frame, false); } } + protected void validateModel() { + boolean valid = true; + + ExportApplicationUIModel model = getModel(); + + if (model.getSelectedCampaign() == null) { + + // no campaign selected + valid = false; + } else { + + if (!model.getExportDirectory().exists()) { + + // export directory does not exists + valid = false; + } + } + + model.setValid(valid); + } + + protected boolean checkFileToExport(ExportApplicationModel dataModel) { + boolean doExport = true; + + if (dataModel.getExportFile().exists()) { + doExport = SammoaUtil.askQuestion( + ui, + _("sammoa.messageDialog.sammoa.exportFile.alreadyExists", + dataModel.getExportFile())); + } + return doExport; + } + public void close() { context.changeScreen(SammoaScreen.HOME); } @@ -229,6 +280,8 @@ filename = ""; } else { flights = flightService.getFlights(newCampaign); + // add a null value to unselect flights + flights.add(0, null); filename = String.format("campaign-%s.sammoa", newCampaign.getCode()); } if (logger.isDebugEnabled()) { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUIModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUIModel.java 2012-08-18 08:05:22 UTC (rev 429) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUIModel.java 2012-08-18 08:08:55 UTC (rev 430) @@ -59,6 +59,8 @@ public static final String PROPERTY_CALLBACK = "callback"; + public static final String PROPERTY_VALID = "valid"; + protected List<Campaign> campaigns; protected Campaign selectedCampaign; @@ -73,6 +75,8 @@ protected ExportApplicationCallbackMode callback; + protected boolean valid; + public File getExportDirectory() { return exportDirectory; } @@ -149,18 +153,30 @@ firePropertyChange(PROPERTY_CALLBACK, oldValue, callback); } + public boolean isValid() { + return valid; + } + + public void setValid(boolean valid) { + boolean oldValue = this.valid; + this.valid = valid; + firePropertyChange(PROPERTY_VALID, oldValue, valid); + } + public ExportApplicationModel toModel() { Set<Flight> flightsToExport; - if (getSelectedFlight() != null) { + if (getSelectedFlight() == null) { + // all flights of this campaign + flightsToExport = Sets.newHashSet(getFlights()); + // remove the null value + flightsToExport.remove(null); + } else { + // only one flight to export flightsToExport = Sets.newHashSet(getSelectedFlight()); - } else { - - // all flights of this campaign - flightsToExport = Sets.newHashSet(getFlights()); } ExportApplicationModel result = ExportApplicationModel.newModel( new File(getExportDirectory(), getExportFilename()), Modified: trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-08-18 08:05:22 UTC (rev 429) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-08-18 08:08:55 UTC (rev 430) @@ -73,6 +73,7 @@ sammoa.dialog.title.strateFile=Choose a shape file for strates sammoa.dialog.title.transect=New Transect sammoa.dialog.title.transectFile=Choose a shape file for transects +sammoa.error.export.sammoa= sammoa.flight.decorator.flight=Flight %1$d sammoa.flight.decorator.newFlight=New flight sammoa.flight.decorator.notEnded=not ended @@ -138,7 +139,11 @@ sammoa.menu.showLogs=Display logs sammoa.menu.showLogs.tip=Display logs sammoa.message.goto.site=Opening %1$s on navigator +sammoa.messageDialog.map.export.success=Map (with %s rows in dbf) was successfully exported in directory\n\n%s +sammoa.messageDialog.mapOrDbf.exportFile.alreadyExists=Export Shape file (%s)\nor dbf file (%s) already exists.\n\nConfirm to override it? sammoa.messageDialog.observers.import.success=%1$d observers are successfully imported +sammoa.messageDialog.sammoa.export.success=Sammoa was successfully exported in file\n\n%s +sammoa.messageDialog.sammoa.exportFile.alreadyExists=Export File %s already exists.\n\nConfirm to override it? sammoa.messageDialog.species.import.success=%1$d species are successfully imported sammoa.messageDialog.strates.import.success=%1$d strates are successfully imported sammoa.messageDialog.transects.import.success=%1$d transects are successfully imported

1 0

r429 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util
by tchemit＠users.forge.codelutin.com 18 Aug '12

18 Aug '12

Author: tchemit Date: 2012-08-18 10:05:22 +0200 (Sat, 18 Aug 2012) New Revision: 429 Url: http://forge.codelutin.com/repositories/revision/sammoa/429 Log: add more commn ui method Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaUtil.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaUtil.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaUtil.java 2012-08-18 08:04:06 UTC (rev 428) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaUtil.java 2012-08-18 08:05:22 UTC (rev 429) @@ -233,6 +233,16 @@ } } + public static void showSuccessMessage(Component ui, String message) { + JOptionPane.showMessageDialog( + ui, + message, + "Success", + JOptionPane.INFORMATION_MESSAGE, + UIManager.getIcon("info") + ); + } + public static void showErrorMessage(Component ui, String message) { JOptionPane.showMessageDialog( ui, @@ -242,4 +252,13 @@ UIManager.getIcon("error") ); } + + public static boolean askQuestion(Component ui, String message) { + int i = JOptionPane.showConfirmDialog( + ui, + message, + "Question?", + JOptionPane.YES_NO_OPTION); + return i == JOptionPane.YES_OPTION; + } }

1 0

r428 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing
by tchemit＠users.forge.codelutin.com 18 Aug '12

18 Aug '12

Author: tchemit Date: 2012-08-18 10:04:06 +0200 (Sat, 18 Aug 2012) New Revision: 428 Url: http://forge.codelutin.com/repositories/revision/sammoa/428 Log: clean sammoa temp directory when application starts Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/StartApp.java 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 2012-08-17 14:03:32 UTC (rev 427) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/StartApp.java 2012-08-18 08:04:06 UTC (rev 428) @@ -26,14 +26,17 @@ import fr.ulr.sammoa.application.SammoaConfig; import fr.ulr.sammoa.application.SammoaContext; +import fr.ulr.sammoa.application.SammoaTechnicalException; import fr.ulr.sammoa.ui.swing.util.LogFileInitializer; import jaxx.runtime.SwingUtil; +import org.apache.commons.io.FileUtils; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; +import java.io.IOException; import java.util.Locale; /** @@ -47,10 +50,23 @@ public static void main(String... args) { - // Initialization of SammoaContext with configuration from sammoa.properties + // Create sammoa configuration from sammoa.properties file SammoaConfig config = new SammoaConfig("sammoa.properties", args); + + //clean sammoa temporary directory + File tmpDirectory = config.getTmpDirectory(); + try { + // clean tmp dir + FileUtils.cleanDirectory(tmpDirectory); + } catch (IOException e) { + throw new SammoaTechnicalException( + "Could not clean temp directory " + tmpDirectory, e); + } + + // Create application context SammoaContext appContext = new SammoaContext(config); + // Create ui context SammoaUIContext context = SammoaUIContext.newUIContext(appContext); // Initialize log file

1 0

r427 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing
by tchemit＠users.forge.codelutin.com 17 Aug '12

17 Aug '12

Author: tchemit Date: 2012-08-17 16:03:32 +0200 (Fri, 17 Aug 2012) New Revision: 427 Url: http://forge.codelutin.com/repositories/revision/sammoa/427 Log: remove ValidationTable ui Removed: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/ValidationTable.css trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/ValidationTable.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/ValidationTableHandler.java Deleted: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/ValidationTable.css =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/ValidationTable.css 2012-08-17 08:14:14 UTC (rev 426) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/ValidationTable.css 2012-08-17 14:03:32 UTC (rev 427) @@ -1,35 +0,0 @@ -/* - * #%L - * SAMMOA :: UI Swing - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 UMS 3462, Code Lutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -#scrollPanel { - columnHeaderView:{errorTable.getTableHeader()}; -} - -#errorTable { - rowSelectionAllowed:true; - autoCreateRowSorter:true; - autoResizeMode:2; - cellSelectionEnabled:false; - selectionMode:0; - model:{errorTableModel}; -} \ No newline at end of file Deleted: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/ValidationTable.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/ValidationTable.jaxx 2012-08-17 08:14:14 UTC (rev 426) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/ValidationTable.jaxx 2012-08-17 14:03:32 UTC (rev 427) @@ -1,49 +0,0 @@ - -<JPanel id='panel' layout='{new BorderLayout()}'> - - -<JScrollPane id='scrollPanel' constraints='BorderLayout.CENTER'> - <import> - jaxx.runtime.validator.swing.SwingValidatorMessageTableModel - </import> - - <ValidationTableHandler id='handler' constructorParams='this'/> - - <script><![CDATA[ - - protected void $afterCompleteSetup() { - getHandler().init(); - } - - ]]></script> - - <SwingValidatorMessageTableModel id='errorTableModel' - javaBean='handler.getValidationModel()'/> - - <JTable id='errorTable'/> -</JScrollPane> - -</JPanel> \ No newline at end of file Deleted: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/ValidationTableHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/ValidationTableHandler.java 2012-08-17 08:14:14 UTC (rev 426) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/ValidationTableHandler.java 2012-08-17 14:03:32 UTC (rev 427) @@ -1,112 +0,0 @@ -/* - * #%L - * SAMMOA :: UI Swing - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 UMS 3462, Code Lutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ulr.sammoa.ui.swing; - -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; -import jaxx.runtime.validator.swing.SwingValidatorMessageTableRenderer; -import jaxx.runtime.validator.swing.SwingValidatorUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.JComponent; -import javax.swing.JDialog; -import javax.swing.JRootPane; -import javax.swing.KeyStroke; -import java.awt.Component; -import java.awt.Frame; -import java.awt.event.ActionEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; - -import static org.nuiton.i18n.I18n._; - -/** - * TODO - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class ValidationTableHandler { - - private static final Logger logger = LoggerFactory.getLogger(StartApp.class); - - protected final ValidationTable ui; - - public ValidationTableHandler(ValidationTable ui) { - this.ui = ui; - } - - public SwingValidatorMessageTableModel getValidationModel() { - return SammoaUIContext.getUIContext().getFlightUIHandler().getModel().getValidatorTableModel(); - } - - public void init() { - SwingValidatorUtil.installUI(ui.getErrorTable(), - new SwingValidatorMessageTableRenderer()); - } - - public void showInDialog(Frame ui) { - - JDialog f = new JDialog(ui, false); - f.setTitle(_("sammoa.title.validation")); - f.add(this.ui); - f.setResizable(true); - f.setSize(550, 450); - JRootPane rootPane = f.getRootPane(); -// rootPane.setDefaultButton(this.ui.close); - rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "close"); - rootPane.getActionMap().put("close", closeAction); - f.addWindowListener(new WindowAdapter() { - @Override - public void windowClosed(WindowEvent e) { - Component ui = (Component) e.getSource(); - if (logger.isInfoEnabled()) { - logger.info("destroy ui " + ui); - } - JAXXUtil.destroy(ui); -// JAXXUtil.destroy(ValidationTable.this.ui); - } - }); - SwingUtil.center(ui, f); - f.setVisible(true); - } - - final protected Action closeAction = new AbstractAction("close") { - private static final long serialVersionUID = 1L; - - @Override - public void actionPerformed(ActionEvent e) { - JDialog container = ui.getParentContainer(JDialog.class); - if (container != null) { - container.dispose(); - } else { - ui.setVisible(false); - } - } - }; -}

1 0

r426 - trunk
by tchemit＠users.forge.codelutin.com 17 Aug '12

17 Aug '12

Author: tchemit Date: 2012-08-17 10:14:14 +0200 (Fri, 17 Aug 2012) New Revision: 426 Url: http://forge.codelutin.com/repositories/revision/sammoa/426 Log: use last eugene plugin version (+ remove some unused code from pom) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-16 22:56:52 UTC (rev 425) +++ trunk/pom.xml 2012-08-17 08:14:14 UTC (rev 426) @@ -112,11 +112,8 @@ <nuitonUtilsVersion>2.6-SNAPSHOT</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <eugenePluginVersion>2.5-SNAPSHOT</eugenePluginVersion> -  + <eugenePluginVersion>2.5</eugenePluginVersion> <topiaVersion>2.6.12-SNAPSHOT</topiaVersion> -  -  <hibernateVersion>3.6.10.Final</hibernateVersion> <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> @@ -131,8 +128,6 @@ <i18n.bundles>en_GB</i18n.bundles> <i18n.silent>false</i18n.silent> -  -  <license.organizationName> UMS 3462, Code Lutin

1 0

r425 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application/io sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/sammoa sammoa-application/src/main/resources/i18n sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa
by tchemit＠users.forge.codelutin.com 16 Aug '12

16 Aug '12

Author: tchemit Date: 2012-08-17 00:56:52 +0200 (Fri, 17 Aug 2012) New Revision: 425 Url: http://forge.codelutin.com/repositories/revision/sammoa/425 Log: refs #1201: Export format application (begin to use topia csv api) + continue export application Added: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaDbMetas.java trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDbMetasTest.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/CampaignStorages.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/sammoa/ExportApplicationModel.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/sammoa/ExportApplicationService.java trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUIModel.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/CampaignStorages.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/CampaignStorages.java 2012-08-16 22:54:57 UTC (rev 424) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/CampaignStorages.java 2012-08-16 22:56:52 UTC (rev 425) @@ -53,18 +53,31 @@ return result; } + public static CampaignStorage createStorage(File directory, + String campaignId) throws IOException { + CampaignStorage result = new CampaignStorage(directory, campaignId); + createEmptyStructure(result); + return result; + } + public static CampaignStorage copyStorage(CampaignStorage source, File targetDirectory, - String... flightIds) throws IOException { + boolean createCsvDirectory, + Iterable<String> flightIds) throws IOException { - CampaignStorage target = new CampaignStorage(targetDirectory, source.getCampaignId()); + CampaignStorage target = createStorage(targetDirectory, + source.getCampaignId()); createEmptyStructure(target); - FileUtils.copyDirectory(source.getMapDirectory(), target.getMapDirectory()); - if (source.getCsvDirectory().exists()) { + FileUtils.copyDirectory(source.getMapDirectory(), + target.getMapDirectory()); + if (createCsvDirectory) { FileUtils.forceMkdir(target.getCsvDirectory()); - FileUtils.copyDirectory(source.getCsvDirectory(), target.getCsvDirectory()); } + if (source.getCsvDirectory().exists()) { + FileUtils.copyDirectory(source.getCsvDirectory(), + target.getCsvDirectory()); + } for (String flightId : flightIds) { FlightStorage flightStorage = source.getFlightStorage(flightId); FlightStorages.copyStorage(flightStorage, target); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/sammoa/ExportApplicationModel.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/sammoa/ExportApplicationModel.java 2012-08-16 22:54:57 UTC (rev 424) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/sammoa/ExportApplicationModel.java 2012-08-16 22:56:52 UTC (rev 425) @@ -23,10 +23,13 @@ * #L% */ +import com.google.common.collect.Iterables; import fr.ulr.sammoa.persistence.Campaign; import fr.ulr.sammoa.persistence.Flight; +import org.nuiton.topia.persistence.TopiaId; import java.io.File; +import java.util.Set; /** * Model of sammoa export. @@ -37,46 +40,42 @@ public class ExportApplicationModel { public static ExportApplicationModel newModel(File exportDirectory, - String exportFilename, Campaign campaign, - Flight flight, + Set<Flight> flights, ExportApplicationCallbackMode callback) { ExportApplicationModel result = new ExportApplicationModel(); - result.exportDirectory = exportDirectory; - result.exportFilename = exportFilename; + result.exportFile = exportDirectory; result.campaign = campaign; - result.flight = flight; + result.flights = flights; result.callback = callback; return result; } protected Campaign campaign; - protected Flight flight; + protected Set<Flight> flights; - protected File exportDirectory; + protected File exportFile; - protected String exportFilename; - protected ExportApplicationCallbackMode callback; - public File getExportDirectory() { - return exportDirectory; - } - - public String getExportFilename() { - return exportFilename; - } - public Campaign getCampaign() { return campaign; } - public Flight getFlight() { - return flight; + public Set<Flight> getFlights() { + return flights; } public ExportApplicationCallbackMode getCallback() { return callback; } + + public Iterable<String> getFlightIds() { + return Iterables.transform(getFlights(), TopiaId.GET_TOPIA_ID); + } + + public File getExportFile() { + return exportFile; + } } \ No newline at end of file Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/sammoa/ExportApplicationService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/sammoa/ExportApplicationService.java 2012-08-16 22:54:57 UTC (rev 424) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/sammoa/ExportApplicationService.java 2012-08-16 22:56:52 UTC (rev 425) @@ -24,13 +24,41 @@ */ import fr.ulr.sammoa.application.SammoaServiceSupport; +import fr.ulr.sammoa.application.SammoaTechnicalException; import fr.ulr.sammoa.application.io.CampaignStorage; import fr.ulr.sammoa.application.io.CampaignStorages; import fr.ulr.sammoa.persistence.Campaign; +import fr.ulr.sammoa.persistence.SammoaDAOHelper; +import fr.ulr.sammoa.persistence.SammoaDbMetas; +import fr.ulr.sammoa.persistence.SammoaEntityEnum; +import fr.ulr.sammoa.persistence.SammoaPersistence; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaQuery; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.csv.EntityCsvModel; +import org.nuiton.topia.persistence.csv.out.EntityAssociationExportModel; +import org.nuiton.topia.persistence.csv.out.ExportModelFactory; +import org.nuiton.topia.persistence.csv.out.PrepareDataForExport; +import org.nuiton.topia.persistence.csv.out.TopiaCsvExports; +import org.nuiton.topia.persistence.metadata.AssociationMeta; +import org.nuiton.topia.persistence.metadata.ColumnMeta; +import org.nuiton.topia.persistence.metadata.DbMeta; +import org.nuiton.topia.persistence.metadata.MetaFilenameAware; +import org.nuiton.topia.persistence.metadata.TableMeta; import org.nuiton.util.TimeLog; +import org.nuiton.util.ZipUtil; +import org.nuiton.util.csv.ExportModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.File; +import java.io.IOException; +import java.util.List; + /** * To export application as a {@code sammoa} file. * @@ -43,36 +71,59 @@ private static final Logger logger = LoggerFactory.getLogger(ExportApplicationService.class); - - private static final TimeLog timeLog = + private static final TimeLog TIME_LOG = new TimeLog(ExportApplicationService.class); - public void exportApplication(ExportApplicationModel model) { + public void exportApplication(ExportApplicationModel model) throws IOException { if (logger.isInfoEnabled()) { - logger.info("Start Application export to {} :: {}", - model.getExportDirectory(), - model.getExportFilename()); + logger.info("Start Application export to {}", + model.getExportFile()); } long startTime = TimeLog.getTime(); - try { - Thread.sleep(2000); - } catch (InterruptedException e) { - //BOUH! + Campaign campaign = model.getCampaign(); + + String campaignId = campaign.getTopiaId(); + + CampaignStorage storage = CampaignStorages.getStorage(config, campaignId); + + File targetDirectory = new File(config.getTmpDirectory(), + "exportSammoa-" + System.nanoTime()); + + if (logger.isInfoEnabled()) { + logger.info("Temporary storage: {}", targetDirectory); } - Campaign campaign = model.getCampaign(); + Iterable<String> flightIds = model.getFlightIds(); - CampaignStorage storage = CampaignStorages.getStorage( - config, campaign.getTopiaId()); + CampaignStorage targetStorage = CampaignStorages.copyStorage( + storage, targetDirectory, true, flightIds); - //TODO - startTime = timeLog.log(startTime, "exportApplication", - "after Export execution"); + startTime = TIME_LOG.log(startTime, "exportApplication", + "after create Storage structure"); + File csvDirectory = targetStorage.getCsvDirectory(); + + TopiaContext tx = persistence.beginTransaction(); + + try { + + exportReferential(tx, csvDirectory); + exportData(tx, csvDirectory, campaignId, flightIds); + } finally { + persistence.endTransaction(tx); + } + + compressZipFile(model.getExportFile(), + targetStorage.getDirectory(), + false); + + startTime = TIME_LOG.log(startTime, "exportApplication", + "after export db to csv files "); + switch (model.getCallback()) { case NOTHING: @@ -86,10 +137,52 @@ break; } - timeLog.log(startTime, "exportApplication", "after Callback execution"); + TIME_LOG.log(startTime, "exportApplication", "after Callback execution"); } + protected void exportReferential(TopiaContext tx, File csvDirectory) { + + SammoaEntityEnumPrepareDataForExport prepareDataForExport = + new SammoaEntityEnumPrepareDataForExport(persistence, tx); + + DbMeta<SammoaEntityEnum> dbMetas = persistence.getDbMetas(); + + MetaFilenameAware<SammoaEntityEnum>[] referencialEntries = + SammoaDbMetas.getReferencialEntries(dbMetas); + + for (MetaFilenameAware<SammoaEntityEnum> entry : referencialEntries) { + + File entryFile = new File(csvDirectory, entry.getFilename()); + if (logger.isInfoEnabled()) { + logger.info("Will export {} to {}", entry, entryFile); + } + + if (entry instanceof AssociationMeta) { + AssociationMeta<SammoaEntityEnum> associationMeta = + (AssociationMeta<SammoaEntityEnum>) entry; + TopiaCsvExports.exportData(associationMeta, + defaultExportModelFactory, + prepareDataForExport, + entryFile); + } else { + TableMeta<SammoaEntityEnum> tableMeta = + (TableMeta<SammoaEntityEnum>) entry; + + TopiaCsvExports.exportData(tableMeta, + defaultExportModelFactory, + prepareDataForExport, + entryFile); + } + } + + } + + protected void exportData(TopiaContext tx, File csvDirectory, + String campaignId, + Iterable<String> flightIds) { + } + protected void removeFlightData(ExportApplicationModel model) { if (logger.isInfoEnabled()) { logger.info("Will remove flight data for campaign {}", @@ -102,4 +195,107 @@ logger.info("Will remove all data from current db (create a new db...)"); } } + + private ExportModelFactory<SammoaEntityEnum> defaultExportModelFactory = new ExportModelFactory<SammoaEntityEnum>() { + @Override + public <E extends TopiaEntity> ExportModel<E> buildForExport(TableMeta<SammoaEntityEnum> meta) { + EntityCsvModel<SammoaEntityEnum, E> model = + EntityCsvModel.newModel(config.getCsvSeparator(), + meta, + TopiaEntity.TOPIA_ID); + + + for (ColumnMeta columnMeta : meta) { + String propertyName = columnMeta.getName(); + Class<?> type = columnMeta.getType(); + if (columnMeta.isFK()) { + + Class<TopiaEntity> entityType = (Class<TopiaEntity>) type; + + // export foreign key value as his topiaId + model.addForeignKeyForExport(propertyName, entityType); + + } else { + model.addDefaultColumn(propertyName, type); + } + } + return model; + } + + @Override + public <E extends TopiaEntity> ExportModel<E> buildForExport(AssociationMeta<SammoaEntityEnum> associationMeta) { + ExportModel<E> model = EntityAssociationExportModel.newExportModel( + config.getCsvSeparator(), + associationMeta + ); + return model; + } + }; + + public static void compressZipFile(File zipFile, File directory) throws IOException { + compressZipFile(zipFile, directory, true); + } + + public static void compressZipFile(File zipFile, File directory, boolean delete) throws IOException { + + FileUtils.forceMkdir(zipFile.getParentFile()); + + try { + ZipUtil.compress(zipFile, directory); + } finally { + if (delete) { + FileUtils.deleteDirectory(directory); + } + } + } + + protected class SammoaEntityEnumPrepareDataForExport implements PrepareDataForExport<SammoaEntityEnum> { + + protected final SammoaPersistence persistence; + + protected final TopiaContext tx; + + public SammoaEntityEnumPrepareDataForExport(SammoaPersistence persistence, TopiaContext tx) { + + this.persistence = persistence; + this.tx = tx; + } + + @Override + public <E extends TopiaEntity> List<E> prepareData(TableMeta<SammoaEntityEnum> tableMeta) { + + return getEntities(tx, tableMeta, null); + } + + @Override + public <E extends TopiaEntity> List<E> prepareData(AssociationMeta<SammoaEntityEnum> associationMeta) { + TableMeta<SammoaEntityEnum> tableMeta = persistence.getDbMetas().getTable(associationMeta.getSource()); + return getEntities(tx, tableMeta, "size(e." + associationMeta.getName() + ") > 0"); + } + + protected <E extends TopiaEntity> List<E> getEntities(TopiaContext tx, + TableMeta<SammoaEntityEnum> tableMeta, + String extraWhereQuery) { + + List<E> result; + SammoaEntityEnum entityEnum = tableMeta.getSource(); + try { + TopiaDAO<E> dao = SammoaDAOHelper.<E, TopiaDAO<E>>getDAO( + tx, (Class<E>) entityEnum.getContract()); + + // first query to count datas + + TopiaQuery query = dao.createQuery("e"); + + if (StringUtils.isNotEmpty(extraWhereQuery)) { + query.addWhere(extraWhereQuery); + } + + result = dao.findAllByQuery(query); + return result; + } catch (TopiaException eee) { + throw new SammoaTechnicalException("Could not obtain data", eee); + } + } + } } Modified: trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties =================================================================== --- trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties 2012-08-16 22:54:57 UTC (rev 424) +++ trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties 2012-08-16 22:56:52 UTC (rev 425) @@ -6,6 +6,7 @@ sammoa.config.background.shape.file= sammoa.config.campaign.directory=Directory where are stored campaign data (maps, flight audio files,...) sammoa.config.campaign.id= +sammoa.config.csv.separator= sammoa.config.data.directory=Main directory where all data are stored. You can use ${data.directory} in other property values (ex\: ${data.directory}/audio). sammoa.config.effort.number= sammoa.config.flight.number= @@ -19,6 +20,7 @@ sammoa.config.observation.number= sammoa.config.strate.shape.file= sammoa.config.system.id= +sammoa.config.tmp.directory=Temporary directory used for different task (import, export,...) sammoa.config.transect.shape.file= sammoa.config.ui.add=Add sammoa.config.ui.begin=Begin Added: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaDbMetas.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaDbMetas.java (rev 0) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaDbMetas.java 2012-08-16 22:56:52 UTC (rev 425) @@ -0,0 +1,118 @@ +package fr.ulr.sammoa.persistence; + +import com.google.common.collect.Lists; +import com.google.common.collect.Multimap; +import org.nuiton.topia.persistence.metadata.DbMeta; +import org.nuiton.topia.persistence.metadata.MetaFilenameAware; +import org.nuiton.topia.persistence.metadata.Metadatas; +import org.nuiton.topia.persistence.metadata.TopiaEntityEnumProvider; + +import java.util.List; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.6 + */ +public class SammoaDbMetas { + + private static final SammoaEntityEnum[] EMPTY_ENTITY_TYPE_ARRAY = + new SammoaEntityEnum[0]; + + public static DbMeta<SammoaEntityEnum> newDbMetas() { + return DbMeta.newDbMeta(SammoaEntityEnum.values(), + EMPTY_ENTITY_TYPE_ARRAY, + new SammoaTopiaEntityEnumProvider()); + } + + /** + * @return the entity types of data in correct order for replication + * purpose. + */ + public static SammoaEntityEnum[] getDataTypes() { + + List<SammoaEntityEnum> result = Lists.newLinkedList(); + + result.add(SammoaEntityEnum.TransectFlight); + result.add(SammoaEntityEnum.Flight); + result.add(SammoaEntityEnum.Route); + result.add(SammoaEntityEnum.Observation); + result.add(SammoaEntityEnum.ObserverPosition); + result.add(SammoaEntityEnum.GeoPoint); + + return result.toArray(new SammoaEntityEnum[result.size()]); + } + + /** + * @return the entity types of reference in correct order for copy + * purpose (says import / export of all a database. + */ + public static SammoaEntityEnum[] getReferenceTypes() { + List<SammoaEntityEnum> result = Lists.newLinkedList(); + + // with no dep + result.add(SammoaEntityEnum.Region); + result.add(SammoaEntityEnum.Campaign); + result.add(SammoaEntityEnum.Strate); + result.add(SammoaEntityEnum.Sector); + result.add(SammoaEntityEnum.Transect); + result.add(SammoaEntityEnum.Observer); + result.add(SammoaEntityEnum.Species); + + return result.toArray(new SammoaEntityEnum[result.size()]); + } + + public static MetaFilenameAware<SammoaEntityEnum>[] getAllEntries(DbMeta<SammoaEntityEnum> dbMeta) { + + List<MetaFilenameAware<SammoaEntityEnum>> entities = Lists.newArrayList(); + List<MetaFilenameAware<SammoaEntityEnum>> associations = Lists.newArrayList(); + + Metadatas.addEntries(dbMeta, entities, associations, getReferenceTypes()); + Metadatas.addEntries(dbMeta, entities, associations, getDataTypes()); + entities.addAll(associations); + return entities.toArray(new MetaFilenameAware[entities.size()]); + } + + public static MetaFilenameAware<SammoaEntityEnum>[] getReferencialEntries(DbMeta<SammoaEntityEnum> dbMeta) { + + List<MetaFilenameAware<SammoaEntityEnum>> entities = Lists.newArrayList(); + List<MetaFilenameAware<SammoaEntityEnum>> associations = Lists.newArrayList(); + entities.addAll(associations); + Metadatas.addEntries(dbMeta, entities, associations, getReferenceTypes()); + + return entities.toArray(new MetaFilenameAware[entities.size()]); + } + + public static MetaFilenameAware<SammoaEntityEnum>[] getDataEntries(DbMeta<SammoaEntityEnum> dbMeta) { + + List<MetaFilenameAware<SammoaEntityEnum>> entities = Lists.newArrayList(); + + Metadatas.addEntries(dbMeta, entities, null, getDataTypes()); + return entities.toArray(new MetaFilenameAware[entities.size()]); + } + + public static Multimap<SammoaEntityEnum, MetaFilenameAware<SammoaEntityEnum>> getDataAssociationsEntries(DbMeta<SammoaEntityEnum> dbMeta) { + + List<MetaFilenameAware<SammoaEntityEnum>> associations = Lists.newArrayList(); + + Metadatas.addEntries(dbMeta, null, associations, getDataTypes()); + + Multimap<SammoaEntityEnum, MetaFilenameAware<SammoaEntityEnum>> associationsBySource = Metadatas.split(associations); + return associationsBySource; + } + + /** + * Implementation of {@link TopiaEntityEnumProvider} for Sammoa. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.6 + */ + public static class SammoaTopiaEntityEnumProvider implements TopiaEntityEnumProvider<SammoaEntityEnum> { + + @Override + public <E> SammoaEntityEnum getEntityEnum(Class<E> type) { + return SammoaEntityEnum.valueOf(type); + } + } +} Property changes on: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaDbMetas.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java 2012-08-16 22:54:57 UTC (rev 424) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java 2012-08-16 22:56:52 UTC (rev 425) @@ -31,13 +31,14 @@ import org.nuiton.topia.TopiaNotFoundException; import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.metadata.DbMeta; import java.util.Properties; /** * Persistence context for SAMMOA. This class must be used for all transaction * management. An {@link AutoSaveListener} will be used to commit all entities - * changed every {@code autoCommitDelay} defined in constructor + * changed every {@code autoCommitDelay} defined in constructor * {@link #SammoaPersistence(Properties, long)}. * <p/> * You will create a transaction with {@link #beginTransaction()} and on finally @@ -54,17 +55,19 @@ protected TopiaContext rootContext; protected Properties dbConfiguration; - + protected AutoSaveListener autoSaveListener; + protected DbMeta<SammoaEntityEnum> dbMetas; + /** * Constructor of SammoaPersistence with {@code dbConfiguration} for * {@link TopiaContextFactory#getContext(Properties)} and {@code autoCommitDelay} * for {@link AutoSaveListener}. - * + * * @param dbConfiguration Configuration for Topia * @param autoCommitDelay Delay in milliseconds for auto commit period - * @see #open(Properties, long) + * @see #open(Properties, long) */ public SammoaPersistence(Properties dbConfiguration, long autoCommitDelay) { open(dbConfiguration, autoCommitDelay); @@ -96,10 +99,10 @@ * will be automatically bind on all entities change. During the transaction * time, no auto commit will be done, the next {@link #endTransaction(TopiaContext)} * call will release the AutoSaveListener to continue looking for change. - * + * * @return a new TopiaContext - * @see #endTransaction(TopiaContext) - * @see TopiaContext#beginTransaction() + * @see #endTransaction(TopiaContext) + * @see TopiaContext#beginTransaction() */ public TopiaContext beginTransaction() { autoSaveListener.stop(); @@ -110,16 +113,14 @@ /** * Delay the {@code entity} creation using the {@link AutoSaveListener} - * + * * @param entity TopiaEntity to create automatically on next auto commit */ public void delayEntityCreation(TopiaEntity entity) { autoSaveListener.addCreatedEntity(entity); } - /** - * Stop the auto save listener - */ + /** Stop the auto save listener */ public void stopAutoSaveListener() { autoSaveListener.stop(); } @@ -127,19 +128,17 @@ /** * End the {@code transaction}. The {@link AutoSaveListener} will be released * to continue looking for entities change. - * + * * @param transaction TopiaContext to end - * @see #beginTransaction() - * @see TopiaContext#closeContext() + * @see #beginTransaction() + * @see TopiaContext#closeContext() */ public void endTransaction(TopiaContext transaction) { closeContext(transaction); autoSaveListener.start(); } - /** - * @return the main TopiaContext where all other transactions are opened - */ + /** @return the main TopiaContext where all other transactions are opened */ public TopiaContext getRootContext() { if (rootContext == null) { try { @@ -151,17 +150,15 @@ return rootContext; } - /** - * @param rootContext the main TopiaContext to use - */ + /** @param rootContext the main TopiaContext to use */ public void setRootContext(TopiaContext rootContext) { this.rootContext = rootContext; } /** - * Close the persistence context. This will close the main {@link TopiaContext} + * Close the persistence context. This will close the main {@link TopiaContext} * and the {@link AutoSaveListener}. - * + * * @see AutoSaveListener#stop() */ public void close() { @@ -172,11 +169,18 @@ } } + public DbMeta<SammoaEntityEnum> getDbMetas() { + if (dbMetas == null) { + dbMetas = SammoaDbMetas.newDbMetas(); + } + return dbMetas; + } + /** * Open a new {@link TopiaContext}. Errors are thrown using {@link TopiaRuntimeException} - * + * * @return a new topiaContext - * @see TopiaContext#beginTransaction() + * @see TopiaContext#beginTransaction() */ protected TopiaContext openContext() { try { Added: trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDbMetasTest.java =================================================================== --- trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDbMetasTest.java (rev 0) +++ trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDbMetasTest.java 2012-08-16 22:56:52 UTC (rev 425) @@ -0,0 +1,74 @@ +package fr.ulr.sammoa.persistence; + +import com.google.common.collect.Multimap; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.nuiton.topia.persistence.metadata.DbMeta; +import org.nuiton.topia.persistence.metadata.MetaFilenameAware; + +/** + * Tests the{@link SammoaDbMetas}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.6 + */ +public class SammoaDbMetasTest { + + protected DbMeta<SammoaEntityEnum> dbMetas; + + + @Before + public void setUp() throws Exception { + dbMetas = SammoaDbMetas.newDbMetas(); + + } + + @Test + public void getAllEntries() throws Exception { + + MetaFilenameAware<SammoaEntityEnum>[] entries = + SammoaDbMetas.getAllEntries(dbMetas); + Assert.assertNotNull(entries); + Assert.assertEquals(SammoaDbMetas.getReferenceTypes().length + + SammoaDbMetas.getDataTypes().length + + 4 /* (data associations) */, + entries.length); + } + + @Test + public void getReferencialEntries() throws Exception { + + MetaFilenameAware<SammoaEntityEnum>[] entries = + SammoaDbMetas.getReferencialEntries(dbMetas); + + Assert.assertNotNull(entries); + Assert.assertEquals(SammoaDbMetas.getReferenceTypes().length, + entries.length); + } + + @Test + public void getDataEntries() throws Exception { + + MetaFilenameAware<SammoaEntityEnum>[] entries = + SammoaDbMetas.getDataEntries(dbMetas); + Assert.assertNotNull(entries); + Assert.assertEquals(SammoaDbMetas.getDataTypes().length, + entries.length); + } + + @Test + public void getDataAssociationsEntries() throws Exception { + + Multimap<SammoaEntityEnum, MetaFilenameAware<SammoaEntityEnum>> entries = + SammoaDbMetas.getDataAssociationsEntries(dbMetas); + Assert.assertNotNull(entries); + Assert.assertEquals(4, entries.size()); + Assert.assertTrue(entries.containsKey(SammoaEntityEnum.TransectFlight)); + Assert.assertEquals(1, entries.get(SammoaEntityEnum.TransectFlight).size()); + Assert.assertTrue(entries.containsKey(SammoaEntityEnum.Flight)); + Assert.assertEquals(2, entries.get(SammoaEntityEnum.Flight).size()); + Assert.assertTrue(entries.containsKey(SammoaEntityEnum.Route)); + Assert.assertEquals(1, entries.get(SammoaEntityEnum.Route).size()); + } +} Property changes on: trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDbMetasTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUIHandler.java 2012-08-16 22:54:57 UTC (rev 424) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUIHandler.java 2012-08-16 22:56:52 UTC (rev 425) @@ -37,6 +37,7 @@ import fr.ulr.sammoa.ui.swing.SammoaUIHandler; import fr.ulr.sammoa.ui.swing.util.SammoaUtil; import jaxx.runtime.SwingUtil; +import jaxx.runtime.swing.ErrorDialogUI; import org.nuiton.util.FileUtil; import org.nuiton.util.decorator.Decorator; import org.slf4j.Logger; @@ -46,6 +47,7 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; +import java.io.IOException; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -182,6 +184,8 @@ ExportApplicationModel dataModel = getModel().toModel(); exportService.exportApplication(dataModel); + } catch (IOException e) { + ErrorDialogUI.showError(e); } finally { SammoaUtil.updateBusyState(frame, false); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUIModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUIModel.java 2012-08-16 22:54:57 UTC (rev 424) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUIModel.java 2012-08-16 22:56:52 UTC (rev 425) @@ -24,6 +24,7 @@ */ import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import fr.ulr.sammoa.application.io.output.sammoa.ExportApplicationCallbackMode; import fr.ulr.sammoa.application.io.output.sammoa.ExportApplicationModel; import fr.ulr.sammoa.persistence.Campaign; @@ -32,6 +33,7 @@ import java.io.File; import java.util.List; +import java.util.Set; /** * Model of export application UI. @@ -149,11 +151,21 @@ public ExportApplicationModel toModel() { + Set<Flight> flightsToExport; + + if (getSelectedFlight() != null) { + + // only one flight to export + flightsToExport = Sets.newHashSet(getSelectedFlight()); + } else { + + // all flights of this campaign + flightsToExport = Sets.newHashSet(getFlights()); + } ExportApplicationModel result = ExportApplicationModel.newModel( - getExportDirectory(), - getExportFilename(), + new File(getExportDirectory(), getExportFilename()), getSelectedCampaign(), - getSelectedFlight(), + flightsToExport, getCallback() ); return result;

1 0

r424 - trunk/sammoa-persistence/src/main/xmi
by tchemit＠users.forge.codelutin.com 16 Aug '12

16 Aug '12

Author: tchemit Date: 2012-08-17 00:54:57 +0200 (Fri, 17 Aug 2012) New Revision: 424 Url: http://forge.codelutin.com/repositories/revision/sammoa/424 Log: generate SammoaEntityEnum as a regular class + generate also EntityOperator Modified: trunk/sammoa-persistence/src/main/xmi/sammoa.properties Modified: trunk/sammoa-persistence/src/main/xmi/sammoa.properties =================================================================== --- trunk/sammoa-persistence/src/main/xmi/sammoa.properties 2012-08-16 22:53:47 UTC (rev 423) +++ trunk/sammoa-persistence/src/main/xmi/sammoa.properties 2012-08-16 22:54:57 UTC (rev 424) @@ -27,6 +27,8 @@ model.tagvalue.version=1.0 model.tagvalue.doNotGenerateBooleanGetMethods=true model.tagvalue.indexForeignKeys=true +model.tagValue.generateOperatorForDAOHelper=true +model.tagValue.generateStandaloneEnumForDAOHelper=true #model.tagvalue.java.lang.String=text

1 0

r423 - trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application
by tchemit＠users.forge.codelutin.com 16 Aug '12

16 Aug '12

Author: tchemit Date: 2012-08-17 00:53:47 +0200 (Fri, 17 Aug 2012) New Revision: 423 Url: http://forge.codelutin.com/repositories/revision/sammoa/423 Log: add new temp directory in config + csv separator (for in.out csv) + never used direct transaltion in Configuration : enum = static Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java 2012-08-16 22:51:57 UTC (rev 422) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java 2012-08-16 22:53:47 UTC (rev 423) @@ -312,6 +312,18 @@ return result; } + public File getTmpDirectory() { + File result = getOrCreateDirectory(SammoaConfigOption.TMP_DIRECTORY); + return result; + } + + public char getCsvSeparator() { + char csvSeparator = applicationConfig.getOption( + char.class, SammoaConfigOption.CSV_SEPARATOR.key); + Preconditions.checkNotNull(csvSeparator); + return csvSeparator; + } + /** * All Sammoa configuration options. * @@ -327,10 +339,15 @@ File.class ), CAMPAIGN_DIRECTORY("campaign.directory", - n_("sammoa.config.campaign.directory"), - "${data.directory}/campaign", - File.class + n_("sammoa.config.campaign.directory"), + "${data.directory}/campaign", + File.class ), + TMP_DIRECTORY("tmp.directory", + n_("sammoa.config.tmp.directory"), + "${java.io.tmpdir}/sammoa", + File.class + ), LOG_FILE("log.file", n_("sammoa.config.log.file"), "${data.directory}/log/sammoa.log", @@ -404,74 +421,77 @@ ), KEY_START("ui." + PROPERTY_START, - _("sammoa.config.ui.start"), + n_("sammoa.config.ui.start"), "ctrl pressed A", KeyStroke.class, false, false), KEY_STOP("ui." + PROPERTY_STOP, - _("sammoa.config.ui.stop"), + n_("sammoa.config.ui.stop"), "ctrl pressed T", KeyStroke.class, false, false), KEY_BEGIN("ui." + PROPERTY_BEGIN, - _("sammoa.config.ui.begin"), + n_("sammoa.config.ui.begin"), "pressed F5", KeyStroke.class, false, false), KEY_END("ui." + PROPERTY_END, - _("sammoa.config.ui.end"), + n_("sammoa.config.ui.end"), "pressed F9", KeyStroke.class, false, false), KEY_NEXT("ui." + PROPERTY_NEXT, - _("sammoa.config.ui.next"), + n_("sammoa.config.ui.next"), "pressed F10", KeyStroke.class, false, false), KEY_ADD("ui." + PROPERTY_ADD, - _("sammoa.config.ui.add"), + n_("sammoa.config.ui.add"), "pressed F7", KeyStroke.class, false, false), KEY_LEFT_OBSERVATION("ui." + PROPERTY_LEFT_OBSERVATION, - _("sammoa.config.ui.leftObservation"), + n_("sammoa.config.ui.leftObservation"), "pressed F1", KeyStroke.class, false, false), KEY_CENTER_OBSERVATION("ui." + PROPERTY_CENTER_OBSERVATION, - _("sammoa.config.ui.centerObservation"), + n_("sammoa.config.ui.centerObservation"), "pressed F3", KeyStroke.class, false, false), KEY_RIGHT_OBSERVATION("ui." + PROPERTY_RIGHT_OBSERVATION, - _("sammoa.config.ui.rightObservation"), + n_("sammoa.config.ui.rightObservation"), "pressed F12", KeyStroke.class, false, false), KEY_CIRCLE_BACK("ui." + PROPERTY_CIRCLE_BACK, - _("sammoa.config.ui.circleBack"), + n_("sammoa.config.ui.circleBack"), "pressed F11", KeyStroke.class, false, - false); + false), + CSV_SEPARATOR("sammoa.csv.separator", + n_("sammoa.config.csv.separator"), + ";", char.class); /** Configuration key. */ private final String key;

1 0

r422 - trunk
by tchemit＠users.forge.codelutin.com 16 Aug '12

16 Aug '12

Author: tchemit Date: 2012-08-17 00:51:57 +0200 (Fri, 17 Aug 2012) New Revision: 422 Url: http://forge.codelutin.com/repositories/revision/sammoa/422 Log: updates to nuiton-utils 2.6 and jaxx 2.5.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-14 18:47:12 UTC (rev 421) +++ trunk/pom.xml 2012-08-16 22:51:57 UTC (rev 422) @@ -109,7 +109,7 @@  - <nuitonUtilsVersion>2.5.3</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6-SNAPSHOT</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <eugenePluginVersion>2.5-SNAPSHOT</eugenePluginVersion> @@ -121,7 +121,7 @@ <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <jaxxVersion>2.5.4</jaxxVersion> + <jaxxVersion>2.5.5-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.4</xworkVersion>

1 0

r421 - in trunk: . sammoa-application/src/main/resources/i18n sammoa-persistence sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing
by tchemit＠users.forge.codelutin.com 14 Aug '12

14 Aug '12

Author: tchemit Date: 2012-08-14 20:47:12 +0200 (Tue, 14 Aug 2012) New Revision: 421 Url: http://forge.codelutin.com/repositories/revision/sammoa/421 Log: updates to last snapshot fo topia and eugene + remove audo directory from configuration (now it is inside the flightstorage) Modified: trunk/pom.xml trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties trunk/sammoa-persistence/pom.xml trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-14 13:09:01 UTC (rev 420) +++ trunk/pom.xml 2012-08-14 18:47:12 UTC (rev 421) @@ -112,9 +112,9 @@ <nuitonUtilsVersion>2.5.3</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <eugenePluginVersion>2.4.2</eugenePluginVersion> + <eugenePluginVersion>2.5-SNAPSHOT</eugenePluginVersion>  - <topiaVersion>2.6.11</topiaVersion> + <topiaVersion>2.6.12-SNAPSHOT</topiaVersion>   <hibernateVersion>3.6.10.Final</hibernateVersion> @@ -435,7 +435,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <version>${eugenePluginVersion}</version> </plugin> Modified: trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties =================================================================== --- trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties 2012-08-14 13:09:01 UTC (rev 420) +++ trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties 2012-08-14 18:47:12 UTC (rev 421) @@ -4,12 +4,12 @@ sammoa.config.application.version=Version of the application sammoa.config.audio.directory=Directory where audio files are stored. sammoa.config.background.shape.file= +sammoa.config.campaign.directory=Directory where are stored campaign data (maps, flight audio files,...) sammoa.config.campaign.id= sammoa.config.data.directory=Main directory where all data are stored. You can use ${data.directory} in other property values (ex\: ${data.directory}/audio). sammoa.config.effort.number= sammoa.config.flight.number= sammoa.config.fly.mode= -sammoa.config.campaign.directory=Directory where are stored campaign data (maps, flight audio files,...) sammoa.config.gps.check.period=Time in seconds between each GPS capture sammoa.config.gps.device=GPS device port sammoa.config.gps.handler=GpsHandler class \: fr.ulr.sammoa.application.device.gps.GpsHandlerGpylon or fr.ulr.sammoa.application.device.gps.FakeGpsHandler Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2012-08-14 13:09:01 UTC (rev 420) +++ trunk/sammoa-persistence/pom.xml 2012-08-14 18:47:12 UTC (rev 421) @@ -102,7 +102,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <executions> <execution> <phase>generate-sources</phase> @@ -118,7 +118,7 @@ </templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions> 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 2012-08-14 13:09:01 UTC (rev 420) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2012-08-14 18:47:12 UTC (rev 421) @@ -264,8 +264,8 @@ helper.addOption(SammoaConfig.SammoaConfigOption.SYSTEM_ID); helper.addOption(SammoaConfig.SammoaConfigOption.DATA_DIRECTORY); helper.setOptionCallBack("ui"); - helper.addOption(SammoaConfig.SammoaConfigOption.AUDIO_DIRECTORY); - helper.setOptionCallBack("ui"); +// helper.addOption(SammoaConfig.SammoaConfigOption.CAMPAIGN_DIRECTORY); +// helper.setOptionCallBack("ui"); helper.addOption(SammoaConfig.SammoaConfigOption.FLIGHT_NUMBER); helper.addOption(SammoaConfig.SammoaConfigOption.BACKGROUND_SHAPE_FILE); helper.setOptionCallBack("ui");

1 0