January 2013 - Tutti-commits - mailman.cloud.codelutin.com

r157 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing java/fr/ifremer/tutti/ui/swing/content/home java/fr/ifremer/tutti/ui/swing/content/operation resources/fr/ifremer/tutti/ui/swing/content/operation resources/i18n resources/icons
by tchemit＠users.forge.codelutin.com Jan. 8, 2013

Jan. 8, 2013

Author: tchemit Date: 2013-01-08 10:28:42 +0100 (Tue, 08 Jan 2013) New Revision: 157 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/157 Log: refs #1908: [CONSOLIDATION] Mise en place des deux contextes de validation (pour les captures) Added: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-error-validation.xml trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-error-validation.xml trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-warning-validation.xml trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-warning-validation.xml trunk/tutti-ui-swing/src/main/resources/icons/action-validate.png Removed: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-error-validation.xml trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-warning-validation.xml Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUI.css 2013-01-07 22:58:44 UTC (rev 156) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUI.css 2013-01-08 09:28:42 UTC (rev 157) @@ -77,6 +77,14 @@ /*actionIcon: "catches";*/ } +#menuActionValidateCatches { + text: "tutti.action.validateCatches"; + toolTipText: "tutti.action.validateCatches.tip"; + mnemonic: V; + enabled: {model.getScreen() != TuttiScreen.EDIT_FISHING_OPERATION && model.isCruiseContextFilled()}; + actionIcon: validate; +} + #menuSynchronisations { text: "tutti.menu.synchronisations"; toolTipText: "tutti.menu.synchronisations.tip"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUI.jaxx 2013-01-07 22:58:44 UTC (rev 156) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUI.jaxx 2013-01-08 09:28:42 UTC (rev 157) @@ -68,6 +68,8 @@ onActionPerformed="getHandler().showSelectCampaign()"/> <JMenuItem id='menuActionFillCatches' onActionPerformed="getHandler().showFillCatches()"/> + <JMenuItem id='menuActionValidateCatches' + onActionPerformed="getHandler().showFillCatches()"/> </JMenu> <JMenu id='menuSynchronisations'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java 2013-01-07 22:58:44 UTC (rev 156) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java 2013-01-08 09:28:42 UTC (rev 157) @@ -113,16 +113,18 @@ TuttiScreen screen; - if (context.isCruiseContextFilled()) { +// if (context.isCruiseContextFilled()) { +// +// // direct fill catches screen +// screen = TuttiScreen.EDIT_FISHING_OPERATION; +// } else { +// +// // go to select cruise screen +// screen = TuttiScreen.SELECT_CRUISE; +// } - // direct fill catches screen - screen = TuttiScreen.EDIT_FISHING_OPERATION; - } else { + screen = TuttiScreen.SELECT_CRUISE; - // go to select cruise screen - screen = TuttiScreen.SELECT_CRUISE; - } - context.setScreen(screen); } @@ -185,9 +187,15 @@ } public void showFillCatches() { + context.setValidationContext(TuttiUIContext.VALIDATION_CONTEXT_EDIT); context.setScreen(TuttiScreen.EDIT_FISHING_OPERATION); } + public void showValidateCatches() { + context.setValidationContext(TuttiUIContext.VALIDATION_CONTEXT_VALIDATE); + context.setScreen(TuttiScreen.EDIT_FISHING_OPERATION); + } + public void showImportScreen() { } @@ -338,7 +346,17 @@ case EDIT_FISHING_OPERATION: - screenTitle = _("tutti.title.edit.operations", getSelectedCruiseTitle()); + String validationContext = context.getValidationContext(); + + if (TuttiUIContext.VALIDATION_CONTEXT_EDIT.equals(validationContext)) { + + // edit catches + screenTitle = _("tutti.title.edit.operations", getSelectedCruiseTitle()); + } else { + + // validate catches + screenTitle = _("tutti.title.validate.operations", getSelectedCruiseTitle()); + } screenUI = new FishingOperationsUI(context); break; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-01-07 22:58:44 UTC (rev 156) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-01-08 09:28:42 UTC (rev 157) @@ -55,6 +55,10 @@ */ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessageNotifier { + public static final String VALIDATION_CONTEXT_EDIT = "edit"; + + public static final String VALIDATION_CONTEXT_VALIDATE = "validate"; + /** Logger. */ private static final Log log = LogFactory.getLog(TuttiUIContext.class); @@ -64,17 +68,19 @@ public static final String PROPERTY_PROTOCOL_ID = "protocolId"; - public static final Set<String> ID_TO_SAVE_PROPERTIES = Sets.newHashSet( - PROPERTY_PROGRAM_ID, - PROPERTY_CRUISE_ID, - PROPERTY_PROTOCOL_ID); - public static final String PROPERTY_SCREEN = "screen"; public static final String PROPERTY_CRUISE_CONTEXT_FILLED = "cruiseContextFilled"; public static final String PROPERTY_PROTOCOL_FILLED = "protocolFilled"; + public static final String PROPERTY_VALIDATION_CONTEXT = "validationContext"; + + public static final Set<String> ID_TO_SAVE_PROPERTIES = Sets.newHashSet( + PROPERTY_PROGRAM_ID, + PROPERTY_CRUISE_ID, + PROPERTY_PROTOCOL_ID); + /** * Application context (only one for all the application). * @@ -145,6 +151,13 @@ */ protected final Set<UIMessageNotifier> messageNotifiers; + /** + * Validation context (used by fishingOperation screens). + * + * @since 0.3 + */ + private String validationContext; + public static TuttiUIContext newContext(TuttiConfig config) { Preconditions.checkNotNull(config); Preconditions.checkState(applicationContext == null, @@ -240,6 +253,16 @@ oldValue, isProtocolFilled()); } + public void setValidationContext(String validationContext) { + Object oldValue = getValidationContext(); + this.validationContext = validationContext; + firePropertyChange(PROPERTY_VALIDATION_CONTEXT, oldValue, validationContext); + } + + public String getValidationContext() { + return validationContext; + } + public void setScreen(TuttiScreen screen) { Object oldValue = getScreen(); this.screen = screen; @@ -362,6 +385,7 @@ programId = null; cruiseId = null; protocolId = null; + validationContext = null; setScreen(null); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2013-01-07 22:58:44 UTC (rev 156) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2013-01-08 09:28:42 UTC (rev 157) @@ -96,7 +96,12 @@ text: "tutti.action.new"; } -#showFishingOperationsButton { - text: "tutti.action.catches"; +#fillFishingOperationsButton { + text: "tutti.action.fillCatches"; enabled: {uiContext.isCruiseContextFilled()}; } + +#validateFishingOperationsButton { + text: "tutti.action.validateCatches"; + enabled: {uiContext.isCruiseContextFilled()}; +} Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2013-01-07 22:58:44 UTC (rev 156) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2013-01-08 09:28:42 UTC (rev 157) @@ -112,8 +112,12 @@ </row> <row> <cell columns='3'> - <JButton id='showFishingOperationsButton' - onActionPerformed='handler.showFishingOperations()'/> + <JPanel layout='{new GridLayout(1,0)}'> + <JButton id='fillFishingOperationsButton' + onActionPerformed='handler.showFillCatches()'/> + <JButton id='validateFishingOperationsButton' + onActionPerformed='handler.showValidateCatches()'/> + </JPanel> </cell> </row> </Table> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-01-07 22:58:44 UTC (rev 156) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-01-08 09:28:42 UTC (rev 157) @@ -231,8 +231,13 @@ } } - public void showFishingOperations() { + public void showFillCatches() { + context.setValidationContext(TuttiUIContext.VALIDATION_CONTEXT_EDIT); + context.setScreen(TuttiScreen.EDIT_FISHING_OPERATION); + } + public void showValidateCatches() { + context.setValidationContext(TuttiUIContext.VALIDATION_CONTEXT_VALIDATE); context.setScreen(TuttiScreen.EDIT_FISHING_OPERATION); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-01-07 22:58:44 UTC (rev 156) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-01-08 09:28:42 UTC (rev 157) @@ -48,11 +48,9 @@ import javax.swing.JLabel; import javax.swing.JPanel; import java.awt.BorderLayout; -import java.awt.CardLayout; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; -import jaxx.runtime.swing.CardLayout2Ext; /** @@ -111,6 +109,8 @@ public void beforeInitUI() { EditFishingOperationUIModel model = new EditFishingOperationUIModel(); + model.setValidationContext(getContext().getValidationContext()); + model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_EMPTY, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { @@ -146,13 +146,13 @@ onSelectedSubStrata(source, newStrata); } }); - + model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_USE_SEXAGECIMAL_FORMAT, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { boolean useSexagecimalFormat = (Boolean) evt.getNewValue(); log.info("property PROPERTY_USE_SEXAGECIMAL_FORMAT changed " + useSexagecimalFormat); - + if (useSexagecimalFormat) { getModel().convertGearShootingCoordinatesDDToDMS(); } else { @@ -164,7 +164,7 @@ // listModelIsModify(model); ui.setContextValue(model); - + fishingOperationMonitor.setBean(model); } @@ -245,6 +245,9 @@ model.setEmpty(true); + //FIXME-tchemit Use this when jaxx-validator will works again :( + //ui.getValidator().setContext(getModel().getValidationContext()); + listenValidatorValid(ui.getValidator(), getModel()); //init gear shooting @@ -282,9 +285,9 @@ //------------------------------------------------------------------------// //-- Public methods --// //------------------------------------------------------------------------// - + public void selectFishingOperation(FishingOperation bean) { - + if (fishingOperationMonitor.wasModified()) { // previous fishingOperation was modified, let's save it @@ -300,7 +303,7 @@ if (beanToSave.isUseSexagecimalFormat()) { beanToSave.convertGearShootingCoordinatesDMSToDD(); } - + // save modified fishing operation FishingOperation toSave = beanToSave.toBean(); @@ -409,7 +412,7 @@ public void save() { EditFishingOperationUIModel model = getModel(); - + // get fishingOperation to save if (model.isUseSexagecimalFormat()) { model.convertGearShootingCoordinatesDMSToDD(); @@ -442,19 +445,19 @@ public void setUseSexagecimalFormat(boolean useSexagecimalFormat) { getModel().setUseSexagecimalFormat(useSexagecimalFormat); } - + public void setGearShootingStartLatitude(String text) { getModel().setGearShootingStartLatitude(Float.valueOf(text)); } - + public void setGearShootingStartLatitudeDegree(String text) { getModel().setGearShootingStartLatitude(Float.valueOf(text)); } - + public void setGearShootingStartLatitudeMinute(String text) { getModel().setGearShootingStartLatitude(Float.valueOf(text)); } - + public void setGearShootingStartLatitudeSecond(String text) { getModel().setGearShootingStartLatitude(Float.valueOf(text)); } @@ -470,11 +473,11 @@ public void setGearShootingEndLongitude(String text) { getModel().setGearShootingEndLongitude(Float.valueOf(text)); } - + //------------------------------------------------------------------------// //-- Protected methods --// //------------------------------------------------------------------------// - + protected void onSelectedStrata(EditFishingOperationUIModel model, FishingOperationLocation newStrata) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-01-07 22:58:44 UTC (rev 156) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-01-08 09:28:42 UTC (rev 157) @@ -24,16 +24,13 @@ * #L% */ -import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.referential.FishingOperationLocation; import fr.ifremer.tutti.persistence.entities.referential.Person; +import fr.ifremer.tutti.persistence.spatial.SexagecimalPosition; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; -import fr.ifremer.tutti.persistence.spatial.SexagecimalPosition; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -65,39 +62,39 @@ public static final String PROPERTY_SUB_STRATA = "subStrata"; public static final String PROPERTY_USE_SEXAGECIMAL_FORMAT = "useSexagecimalFormat"; - + public static final String PROPERTY_GEAR_SHOOTING_START_LATITUDE = "gearShootingStartLatitude"; - + public static final String PROPERTY_GEAR_SHOOTING_START_LATITUDE_DEGREE = "gearShootingStartLatitudeDegree"; - + public static final String PROPERTY_GEAR_SHOOTING_START_LATITUDE_MINUTE = "gearShootingStartLatitudeMinute"; - + public static final String PROPERTY_GEAR_SHOOTING_START_LATITUDE_SECOND = "gearShootingStartLatitudeSecond"; - + public static final String PROPERTY_GEAR_SHOOTING_START_LONGITUDE = "gearShootingStartLongitude"; - + public static final String PROPERTY_GEAR_SHOOTING_START_LONGITUDE_DEGREE = "gearShootingStartLongitudeDegree"; - + public static final String PROPERTY_GEAR_SHOOTING_START_LONGITUDE_MINUTE = "gearShootingStartLongitudeMinute"; - + public static final String PROPERTY_GEAR_SHOOTING_START_LONGITUDE_SECOND = "gearShootingStartLongitudeSecond"; public static final String PROPERTY_GEAR_SHOOTING_START_DATE = "gearShootingStartDate"; public static final String PROPERTY_GEAR_SHOOTING_END_LATITUDE = "gearShootingEndLatitude"; - + public static final String PROPERTY_GEAR_SHOOTING_END_LATITUDE_DEGREE = "gearShootingEndLatitudeDegree"; - + public static final String PROPERTY_GEAR_SHOOTING_END_LATITUDE_MINUTE = "gearShootingEndLatitudeMinute"; - + public static final String PROPERTY_GEAR_SHOOTING_END_LATITUDE_SECOND = "gearShootingEndLatitudeSecond"; public static final String PROPERTY_GEAR_SHOOTING_END_LONGITUDE = "gearShootingEndLongitude"; - + public static final String PROPERTY_GEAR_SHOOTING_END_LONGITUDE_DEGREE = "gearShootingEndLongitudeDegree"; - + public static final String PROPERTY_GEAR_SHOOTING_END_LONGITUDE_MINUTE = "gearShootingEndLongitudeMinute"; - + public static final String PROPERTY_GEAR_SHOOTING_END_LONGITUDE_SECOND = "gearShootingEndLongitudeSecond"; public static final String PROPERTY_GEAR_SHOOTING_END_DATE = "gearShootingEndDate"; @@ -116,6 +113,8 @@ public static final String PROPERTY_SAISISSEUR = "saisisseur"; + public static final String PROPERTY_VALIDATION_CONTEXT = "validationContext"; + /** * Flag when there is no fishing operation selected. * @@ -177,6 +176,8 @@ protected FishingOperation fishingOperation; + protected String validationContext; + protected static Binder<EditFishingOperationUIModel, FishingOperation> toBeanBinder = BinderFactory.newBinder(EditFishingOperationUIModel.class, FishingOperation.class); @@ -282,7 +283,7 @@ this.useSexagecimalFormat = useSexagecimalFormat; firePropertyChange(PROPERTY_USE_SEXAGECIMAL_FORMAT, oldValue, useSexagecimalFormat); } - + public Float getGearShootingStartLatitude() { return gearShootingStartLatitude; } @@ -292,7 +293,7 @@ this.gearShootingStartLatitude = gearShootingStartLatitude; firePropertyChange(PROPERTY_GEAR_SHOOTING_START_LATITUDE, oldValue, gearShootingStartLatitude); } - + public Integer getGearShootingStartLatitudeDegree() { Integer result = gearShootingStartLatitudeAsSexagecimal.getDegre(); if (gearShootingStartLatitudeAsSexagecimal.isSign()) { @@ -300,7 +301,7 @@ } return result; } - + public void setGearShootingStartLatitudeDegree(Integer degree) { Object oldValue = getGearShootingStartLatitudeDegree(); boolean sign = degree != null && degree < 0; @@ -311,22 +312,22 @@ gearShootingStartLatitudeAsSexagecimal.setDegre(degree); firePropertyChange(PROPERTY_GEAR_SHOOTING_START_LATITUDE_DEGREE, oldValue, degree); } - + public Integer getGearShootingStartLatitudeMinute() { return gearShootingStartLatitudeAsSexagecimal.getMinute(); } - + public void setGearShootingStartLatitudeMinute(Integer minute) { Object oldValue = getGearShootingStartLatitudeMinute(); gearShootingStartLatitudeAsSexagecimal.setMinute(minute); firePropertyChange(PROPERTY_GEAR_SHOOTING_START_LATITUDE_MINUTE, oldValue, minute); - + } - + public Integer getGearShootingStartLatitudeSecond() { return gearShootingStartLatitudeAsSexagecimal.getSeconde(); } - + public void setGearShootingStartLatitudeSecond(Integer second) { Object oldValue = getGearShootingStartLatitudeSecond(); gearShootingStartLatitudeAsSexagecimal.setSeconde(second); @@ -343,7 +344,7 @@ firePropertyChange(PROPERTY_GEAR_SHOOTING_START_LONGITUDE, oldValue, gearShootingStartLongitude); } - + public Integer getGearShootingStartLongitudeDegree() { Integer result = gearShootingStartLongitudeAsSexagecimal.getDegre(); if (gearShootingStartLongitudeAsSexagecimal.isSign()) { @@ -351,7 +352,7 @@ } return result; } - + public void setGearShootingStartLongitudeDegree(Integer degree) { Object oldValue = getGearShootingStartLongitudeDegree(); boolean sign = degree != null && degree < 0; @@ -362,28 +363,28 @@ gearShootingStartLongitudeAsSexagecimal.setDegre(degree); firePropertyChange(PROPERTY_GEAR_SHOOTING_START_LONGITUDE_DEGREE, oldValue, degree); } - + public Integer getGearShootingStartLongitudeMinute() { return gearShootingStartLongitudeAsSexagecimal.getMinute(); } - + public void setGearShootingStartLongitudeMinute(Integer minute) { Object oldValue = getGearShootingStartLongitudeMinute(); gearShootingStartLongitudeAsSexagecimal.setMinute(minute); firePropertyChange(PROPERTY_GEAR_SHOOTING_START_LONGITUDE_MINUTE, oldValue, minute); - + } - + public Integer getGearShootingStartLongitudeSecond() { return gearShootingStartLongitudeAsSexagecimal.getSeconde(); } - + public void setGearShootingStartLongitudeSecond(Integer second) { Object oldValue = getGearShootingStartLongitudeSecond(); gearShootingStartLongitudeAsSexagecimal.setSeconde(second); firePropertyChange(PROPERTY_GEAR_SHOOTING_START_LONGITUDE_SECOND, oldValue, second); } - + public Date getGearShootingStartDate() { return gearShootingStartDate; } @@ -403,7 +404,7 @@ this.gearShootingEndLatitude = gearShootingEndLatitude; firePropertyChange(PROPERTY_GEAR_SHOOTING_END_LATITUDE, oldValue, gearShootingEndLatitude); } - + public Integer getGearShootingEndLatitudeDegree() { Integer result = gearShootingEndLatitudeAsSexagecimal.getDegre(); if (gearShootingEndLatitudeAsSexagecimal.isSign()) { @@ -411,7 +412,7 @@ } return result; } - + public void setGearShootingEndLatitudeDegree(Integer degree) { Object oldValue = getGearShootingEndLatitudeDegree(); boolean sign = degree != null && degree < 0; @@ -422,22 +423,22 @@ gearShootingEndLatitudeAsSexagecimal.setDegre(degree); firePropertyChange(PROPERTY_GEAR_SHOOTING_END_LATITUDE_DEGREE, oldValue, degree); } - + public Integer getGearShootingEndLatitudeMinute() { return gearShootingEndLatitudeAsSexagecimal.getMinute(); } - + public void setGearShootingEndLatitudeMinute(Integer minute) { Object oldValue = getGearShootingEndLatitudeMinute(); gearShootingEndLatitudeAsSexagecimal.setMinute(minute); firePropertyChange(PROPERTY_GEAR_SHOOTING_END_LATITUDE_MINUTE, oldValue, minute); - + } - + public Integer getGearShootingEndLatitudeSecond() { return gearShootingEndLatitudeAsSexagecimal.getSeconde(); } - + public void setGearShootingEndLatitudeSecond(Integer second) { Object oldValue = getGearShootingEndLatitudeSecond(); gearShootingEndLatitudeAsSexagecimal.setSeconde(second); @@ -461,7 +462,7 @@ } return result; } - + public void setGearShootingEndLongitudeDegree(Integer degree) { Object oldValue = getGearShootingEndLongitudeDegree(); boolean sign = degree != null && degree < 0; @@ -472,28 +473,28 @@ gearShootingEndLongitudeAsSexagecimal.setDegre(degree); firePropertyChange(PROPERTY_GEAR_SHOOTING_END_LONGITUDE_DEGREE, oldValue, degree); } - + public Integer getGearShootingEndLongitudeMinute() { return gearShootingEndLongitudeAsSexagecimal.getMinute(); } - + public void setGearShootingEndLongitudeMinute(Integer minute) { Object oldValue = getGearShootingEndLongitudeMinute(); gearShootingEndLongitudeAsSexagecimal.setMinute(minute); firePropertyChange(PROPERTY_GEAR_SHOOTING_END_LONGITUDE_MINUTE, oldValue, minute); - + } - + public Integer getGearShootingEndLongitudeSecond() { return gearShootingEndLongitudeAsSexagecimal.getSeconde(); } - + public void setGearShootingEndLongitudeSecond(Integer second) { Object oldValue = getGearShootingEndLongitudeSecond(); gearShootingEndLongitudeAsSexagecimal.setSeconde(second); firePropertyChange(PROPERTY_GEAR_SHOOTING_END_LONGITUDE_SECOND, oldValue, second); } - + public Date getGearShootingEndDate() { return gearShootingEndDate; } @@ -573,15 +574,25 @@ firePropertyChange(PROPERTY_SAISISSEUR, null, saisisseur); } + public String getValidationContext() { + return validationContext; + } + + public void setValidationContext(String validationContext) { + Object oldValue = getValidationContext(); + this.validationContext = validationContext; + firePropertyChange(PROPERTY_VALIDATION_CONTEXT, oldValue, validationContext); + } + @Override protected FishingOperation newEntity() { return fishingOperation; } - + public void convertGearShootingCoordinatesDDToDMS() { SexagecimalPosition position; Integer degree; - + position = SexagecimalPosition.valueOf(gearShootingStartLatitude); degree = position.getDegre(); if (degree != null) { @@ -590,7 +601,7 @@ setGearShootingStartLatitudeDegree(degree); setGearShootingStartLatitudeMinute(position.getMinute()); setGearShootingStartLatitudeSecond(position.getSeconde()); - + position = SexagecimalPosition.valueOf(gearShootingStartLongitude); degree = position.getDegre(); if (degree != null) { @@ -599,19 +610,19 @@ setGearShootingStartLongitudeDegree(degree); setGearShootingStartLongitudeMinute(position.getMinute()); setGearShootingStartLongitudeSecond(position.getSeconde()); - + position = SexagecimalPosition.valueOf(gearShootingEndLatitude); degree = position.getDegre(); if (degree != null) { degree *= position.isSign() ? -1 : 1; } if (position.getDegre() != null) { - + } setGearShootingEndLatitudeDegree(degree); setGearShootingEndLatitudeMinute(position.getMinute()); setGearShootingEndLatitudeSecond(position.getSeconde()); - + position = SexagecimalPosition.valueOf(gearShootingEndLongitude); degree = position.getDegre(); if (degree != null) { @@ -621,19 +632,19 @@ setGearShootingEndLongitudeMinute(position.getMinute()); setGearShootingEndLongitudeSecond(position.getSeconde()); } - + public void convertGearShootingCoordinatesDMSToDD() { Float decimalValue = gearShootingStartLatitudeAsSexagecimal.toDecimal(); setGearShootingStartLatitude(decimalValue); - + decimalValue = gearShootingStartLongitudeAsSexagecimal.toDecimal(); setGearShootingStartLongitude(decimalValue); - + decimalValue = gearShootingEndLatitudeAsSexagecimal.toDecimal(); setGearShootingEndLatitude(decimalValue); - + decimalValue = gearShootingEndLongitudeAsSexagecimal.toDecimal(); setGearShootingEndLongitude(decimalValue); } - + } \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-error-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-error-validation.xml 2013-01-07 22:58:44 UTC (rev 156) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-error-validation.xml 2013-01-08 09:28:42 UTC (rev 157) @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="stationNumber"> - - <field-validator type="required" short-circuit="true"> - <message>tutti.validator.error.fishingOperation.stationNumber.required</message> - </field-validator> - - </field> - - <field name="fishingOperationNumber"> - - <field-validator type="required" short-circuit="true"> - <message>tutti.validator.error.fishingOperation.fishingOperationNumber.required</message> - </field-validator> - - </field> - - <field name="date"> - - <field-validator type="required" short-circuit="true"> - <message>tutti.validator.error.fishingOperation.date.required</message> - </field-validator> - - </field> -</validators> Copied: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-error-validation.xml (from rev 155, trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-error-validation.xml) =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-error-validation.xml (rev 0) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-error-validation.xml 2013-01-08 09:28:42 UTC (rev 157) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="stationNumber"> + + <field-validator type="required" short-circuit="true"> + <message> + tutti.validator.error.fishingOperation.stationNumber.required + </message> + </field-validator> + + </field> + + <field name="fishingOperationNumber"> + + <field-validator type="required" short-circuit="true"> + <message> + tutti.validator.error.fishingOperation.fishingOperationNumber.required + </message> + </field-validator> + + </field> + + <field name="date"> + + <field-validator type="required" short-circuit="true"> + <message>tutti.validator.error.fishingOperation.date.required</message> + </field-validator> + + </field> +</validators> Copied: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-error-validation.xml (from rev 155, trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-error-validation.xml) =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-error-validation.xml (rev 0) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-error-validation.xml 2013-01-08 09:28:42 UTC (rev 157) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="stationNumber"> + + <field-validator type="required" short-circuit="true"> + <message> + tutti.validator.error.fishingOperation.stationNumber.required + </message> + </field-validator> + + </field> + + <field name="fishingOperationNumber"> + + <field-validator type="required" short-circuit="true"> + <message> + tutti.validator.error.fishingOperation.fishingOperationNumber.required + </message> + </field-validator> + + </field> + + <field name="date"> + + <field-validator type="required" short-circuit="true"> + <message>tutti.validator.error.fishingOperation.date.required</message> + </field-validator> + + </field> +</validators> Added: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-warning-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-warning-validation.xml (rev 0) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-warning-validation.xml 2013-01-08 09:28:42 UTC (rev 157) @@ -0,0 +1,322 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> + +<validators> + +  + + <field name="gearShootingStartLatitude"> + + <field-validator type="fieldexpressionwithparams"> + <param name="doubleParams">min:90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat || ( -doubles.min <= gearShootingStartLatitude && gearShootingStartLatitude <= doubles.max ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingStartLatitudeDegree"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:90|max:90</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ( + ( -ints.min < getGearShootingStartLatitudeDegree() && getGearShootingStartLatitudeDegree() < ints.max ) + || ( + ( getGearShootingStartLatitudeDegree() == ints.max || getGearShootingStartLatitudeDegree() == -ints.min ) + && getGearShootingStartLatitudeMinute() == 0 && getGearShootingStartLatitudeSecond() == 0 + ) + ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingStartLatitudeMinute"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingStartLatitudeMinute() && getGearShootingStartLatitudeMinute() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingStartLatitudeSecond"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingStartLatitudeSecond() && getGearShootingStartLatitudeSecond() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + +  + + <field name="gearShootingStartLongitude"> + + <field-validator type="fieldexpressionwithparams"> + <param name="doubleParams">min:180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat || ( -doubles.min <= gearShootingStartLongitude && gearShootingStartLongitude <= doubles.max ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingStartLongitudeDegree"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:180|max:180</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ( + (-ints.min < getGearShootingStartLongitudeDegree() && getGearShootingStartLongitudeDegree() < ints.max) + || ( + ( getGearShootingStartLongitudeDegree() == ints.max || getGearShootingStartLongitudeDegree() == -ints.min ) + && getGearShootingStartLongitudeMinute() == 0 && getGearShootingStartLongitudeSecond() == 0 + ) + ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingStartLongitudeMinute"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingStartLongitudeMinute() && getGearShootingStartLongitudeMinute() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingStartLongitudeSecond"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingStartLongitudeSecond() && getGearShootingStartLongitudeSecond() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + +  + + <field name="gearShootingEndLatitude"> + + <field-validator type="fieldexpressionwithparams"> + <param name="doubleParams">min:90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat || ( -doubles.min <= gearShootingEndLatitude && gearShootingEndLatitude <= doubles.max ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + + <field name="gearShootingEndLatitudeDegree"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:90|max:90</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ( + (-ints.min < getGearShootingEndLatitudeDegree() && getGearShootingEndLatitudeDegree() < ints.max) + || ( + ( getGearShootingEndLatitudeDegree() == ints.max || getGearShootingEndLatitudeDegree() == -ints.min ) + && getGearShootingEndLatitudeMinute() == 0 && getGearShootingEndLatitudeSecond() == 0 + ) + ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingEndLatitudeMinute"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingEndLatitudeMinute() && getGearShootingEndLatitudeMinute() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingEndLatitudeSecond"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingEndLatitudeSecond() && getGearShootingEndLatitudeSecond() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + +  + + <field name="gearShootingEndLongitude"> + + <field-validator type="fieldexpressionwithparams"> + <param name="doubleParams">min:180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat || ( -doubles.min <= gearShootingEndLongitude && gearShootingEndLongitude <= doubles.max ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingEndLongitudeDegree"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:180|max:180</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ( + (-ints.min < getGearShootingEndLongitudeDegree() && getGearShootingEndLongitudeDegree() < ints.max) + || ( + ( getGearShootingEndLongitudeDegree() == ints.max || getGearShootingEndLongitudeDegree() == -ints.min ) + && getGearShootingEndLongitudeMinute() == 0 && getGearShootingEndLongitudeSecond() == 0 + ) + ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingEndLongitudeMinute"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingEndLongitudeMinute() && getGearShootingEndLongitudeMinute() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingEndLongitudeSecond"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingEndLongitudeSecond() && getGearShootingEndLongitudeSecond() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + +</validators> Property changes on: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-warning-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Deleted: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-warning-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-warning-validation.xml 2013-01-07 22:58:44 UTC (rev 156) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-warning-validation.xml 2013-01-08 09:28:42 UTC (rev 157) @@ -1,322 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> - -<validators> - -  - - <field name="gearShootingStartLatitude"> - - <field-validator type="fieldexpressionwithparams"> - <param name="doubleParams">min:90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ - useSexagecimalFormat || ( -doubles.min <= gearShootingStartLatitude && gearShootingStartLatitude <= doubles.max ) - ]]> - </param> - - <message></message> - - </field-validator> - - </field> - - <field name="gearShootingStartLatitudeDegree"> - - <field-validator type="fieldexpressionwithparams"> - <param name="intParams">min:90|max:90</param> - <param name="expression"> - <![CDATA[ - useSexagecimalFormat && ( - ( -ints.min < getGearShootingStartLatitudeDegree() && getGearShootingStartLatitudeDegree() < ints.max ) - || ( - ( getGearShootingStartLatitudeDegree() == ints.max || getGearShootingStartLatitudeDegree() == -ints.min ) - && getGearShootingStartLatitudeMinute() == 0 && getGearShootingStartLatitudeSecond() == 0 - ) - ) - ]]> - </param> - - <message></message> - - </field-validator> - - </field> - - <field name="gearShootingStartLatitudeMinute"> - - <field-validator type="fieldexpressionwithparams"> - <param name="intParams">min:0|max:60</param> - <param name="expression"> - <![CDATA[ - useSexagecimalFormat && ints.min <= getGearShootingStartLatitudeMinute() && getGearShootingStartLatitudeMinute() < ints.max - ]]> - </param> - - <message></message> - - </field-validator> - - </field> - - <field name="gearShootingStartLatitudeSecond"> - - <field-validator type="fieldexpressionwithparams"> - <param name="intParams">min:0|max:60</param> - <param name="expression"> - <![CDATA[ - useSexagecimalFormat && ints.min <= getGearShootingStartLatitudeSecond() && getGearShootingStartLatitudeSecond() < ints.max - ]]> - </param> - - <message></message> - - </field-validator> - - </field> - -  - - <field name="gearShootingStartLongitude"> - - <field-validator type="fieldexpressionwithparams"> - <param name="doubleParams">min:180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ - useSexagecimalFormat || ( -doubles.min <= gearShootingStartLongitude && gearShootingStartLongitude <= doubles.max ) - ]]> - </param> - - <message></message> - - </field-validator> - - </field> - - <field name="gearShootingStartLongitudeDegree"> - - <field-validator type="fieldexpressionwithparams"> - <param name="intParams">min:180|max:180</param> - <param name="expression"> - <![CDATA[ - useSexagecimalFormat && ( - (-ints.min < getGearShootingStartLongitudeDegree() && getGearShootingStartLongitudeDegree() < ints.max) - || ( - ( getGearShootingStartLongitudeDegree() == ints.max || getGearShootingStartLongitudeDegree() == -ints.min ) - && getGearShootingStartLongitudeMinute() == 0 && getGearShootingStartLongitudeSecond() == 0 - ) - ) - ]]> - </param> - - <message></message> - - </field-validator> - - </field> - - <field name="gearShootingStartLongitudeMinute"> - - <field-validator type="fieldexpressionwithparams"> - <param name="intParams">min:0|max:60</param> - <param name="expression"> - <![CDATA[ - useSexagecimalFormat && ints.min <= getGearShootingStartLongitudeMinute() && getGearShootingStartLongitudeMinute() < ints.max - ]]> - </param> - - <message></message> - - </field-validator> - - </field> - - <field name="gearShootingStartLongitudeSecond"> - - <field-validator type="fieldexpressionwithparams"> - <param name="intParams">min:0|max:60</param> - <param name="expression"> - <![CDATA[ - useSexagecimalFormat && ints.min <= getGearShootingStartLongitudeSecond() && getGearShootingStartLongitudeSecond() < ints.max - ]]> - </param> - - <message></message> - - </field-validator> - - </field> - -  - - <field name="gearShootingEndLatitude"> - - <field-validator type="fieldexpressionwithparams"> - <param name="doubleParams">min:90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ - useSexagecimalFormat || ( -doubles.min <= gearShootingEndLatitude && gearShootingEndLatitude <= doubles.max ) - ]]> - </param> - - <message></message> - - </field-validator> - - </field> - - - <field name="gearShootingEndLatitudeDegree"> - - <field-validator type="fieldexpressionwithparams"> - <param name="intParams">min:90|max:90</param> - <param name="expression"> - <![CDATA[ - useSexagecimalFormat && ( - (-ints.min < getGearShootingEndLatitudeDegree() && getGearShootingEndLatitudeDegree() < ints.max) - || ( - ( getGearShootingEndLatitudeDegree() == ints.max || getGearShootingEndLatitudeDegree() == -ints.min ) - && getGearShootingEndLatitudeMinute() == 0 && getGearShootingEndLatitudeSecond() == 0 - ) - ) - ]]> - </param> - - <message></message> - - </field-validator> - - </field> - - <field name="gearShootingEndLatitudeMinute"> - - <field-validator type="fieldexpressionwithparams"> - <param name="intParams">min:0|max:60</param> - <param name="expression"> - <![CDATA[ - useSexagecimalFormat && ints.min <= getGearShootingEndLatitudeMinute() && getGearShootingEndLatitudeMinute() < ints.max - ]]> - </param> - - <message></message> - - </field-validator> - - </field> - - <field name="gearShootingEndLatitudeSecond"> - - <field-validator type="fieldexpressionwithparams"> - <param name="intParams">min:0|max:60</param> - <param name="expression"> - <![CDATA[ - useSexagecimalFormat && ints.min <= getGearShootingEndLatitudeSecond() && getGearShootingEndLatitudeSecond() < ints.max - ]]> - </param> - - <message></message> - - </field-validator> - - </field> - -  - - <field name="gearShootingEndLongitude"> - - <field-validator type="fieldexpressionwithparams"> - <param name="doubleParams">min:180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ - useSexagecimalFormat || ( -doubles.min <= gearShootingEndLongitude && gearShootingEndLongitude <= doubles.max ) - ]]> - </param> - - <message></message> - - </field-validator> - - </field> - - <field name="gearShootingEndLongitudeDegree"> - - <field-validator type="fieldexpressionwithparams"> - <param name="intParams">min:180|max:180</param> - <param name="expression"> - <![CDATA[ - useSexagecimalFormat && ( - (-ints.min < getGearShootingEndLongitudeDegree() && getGearShootingEndLongitudeDegree() < ints.max) - || ( - ( getGearShootingEndLongitudeDegree() == ints.max || getGearShootingEndLongitudeDegree() == -ints.min ) - && getGearShootingEndLongitudeMinute() == 0 && getGearShootingEndLongitudeSecond() == 0 - ) - ) - ]]> - </param> - - <message></message> - - </field-validator> - - </field> - - <field name="gearShootingEndLongitudeMinute"> - - <field-validator type="fieldexpressionwithparams"> - <param name="intParams">min:0|max:60</param> - <param name="expression"> - <![CDATA[ - useSexagecimalFormat && ints.min <= getGearShootingEndLongitudeMinute() && getGearShootingEndLongitudeMinute() < ints.max - ]]> - </param> - - <message></message> - - </field-validator> - - </field> - - <field name="gearShootingEndLongitudeSecond"> - - <field-validator type="fieldexpressionwithparams"> - <param name="intParams">min:0|max:60</param> - <param name="expression"> - <![CDATA[ - useSexagecimalFormat && ints.min <= getGearShootingEndLongitudeSecond() && getGearShootingEndLongitudeSecond() < ints.max - ]]> - </param> - - <message></message> - - </field-validator> - - </field> - -</validators> Copied: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-warning-validation.xml (from rev 156, trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-warning-validation.xml) =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-warning-validation.xml (rev 0) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-warning-validation.xml 2013-01-08 09:28:42 UTC (rev 157) @@ -0,0 +1,322 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> + +<validators> + +  + + <field name="gearShootingStartLatitude"> + + <field-validator type="fieldexpressionwithparams"> + <param name="doubleParams">min:90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat || ( -doubles.min <= gearShootingStartLatitude && gearShootingStartLatitude <= doubles.max ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingStartLatitudeDegree"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:90|max:90</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ( + ( -ints.min < getGearShootingStartLatitudeDegree() && getGearShootingStartLatitudeDegree() < ints.max ) + || ( + ( getGearShootingStartLatitudeDegree() == ints.max || getGearShootingStartLatitudeDegree() == -ints.min ) + && getGearShootingStartLatitudeMinute() == 0 && getGearShootingStartLatitudeSecond() == 0 + ) + ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingStartLatitudeMinute"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingStartLatitudeMinute() && getGearShootingStartLatitudeMinute() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingStartLatitudeSecond"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingStartLatitudeSecond() && getGearShootingStartLatitudeSecond() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + +  + + <field name="gearShootingStartLongitude"> + + <field-validator type="fieldexpressionwithparams"> + <param name="doubleParams">min:180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat || ( -doubles.min <= gearShootingStartLongitude && gearShootingStartLongitude <= doubles.max ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingStartLongitudeDegree"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:180|max:180</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ( + (-ints.min < getGearShootingStartLongitudeDegree() && getGearShootingStartLongitudeDegree() < ints.max) + || ( + ( getGearShootingStartLongitudeDegree() == ints.max || getGearShootingStartLongitudeDegree() == -ints.min ) + && getGearShootingStartLongitudeMinute() == 0 && getGearShootingStartLongitudeSecond() == 0 + ) + ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingStartLongitudeMinute"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingStartLongitudeMinute() && getGearShootingStartLongitudeMinute() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingStartLongitudeSecond"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingStartLongitudeSecond() && getGearShootingStartLongitudeSecond() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + +  + + <field name="gearShootingEndLatitude"> + + <field-validator type="fieldexpressionwithparams"> + <param name="doubleParams">min:90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat || ( -doubles.min <= gearShootingEndLatitude && gearShootingEndLatitude <= doubles.max ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + + <field name="gearShootingEndLatitudeDegree"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:90|max:90</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ( + (-ints.min < getGearShootingEndLatitudeDegree() && getGearShootingEndLatitudeDegree() < ints.max) + || ( + ( getGearShootingEndLatitudeDegree() == ints.max || getGearShootingEndLatitudeDegree() == -ints.min ) + && getGearShootingEndLatitudeMinute() == 0 && getGearShootingEndLatitudeSecond() == 0 + ) + ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingEndLatitudeMinute"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingEndLatitudeMinute() && getGearShootingEndLatitudeMinute() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingEndLatitudeSecond"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingEndLatitudeSecond() && getGearShootingEndLatitudeSecond() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + +  + + <field name="gearShootingEndLongitude"> + + <field-validator type="fieldexpressionwithparams"> + <param name="doubleParams">min:180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat || ( -doubles.min <= gearShootingEndLongitude && gearShootingEndLongitude <= doubles.max ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingEndLongitudeDegree"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:180|max:180</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ( + (-ints.min < getGearShootingEndLongitudeDegree() && getGearShootingEndLongitudeDegree() < ints.max) + || ( + ( getGearShootingEndLongitudeDegree() == ints.max || getGearShootingEndLongitudeDegree() == -ints.min ) + && getGearShootingEndLongitudeMinute() == 0 && getGearShootingEndLongitudeSecond() == 0 + ) + ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingEndLongitudeMinute"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingEndLongitudeMinute() && getGearShootingEndLongitudeMinute() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingEndLongitudeSecond"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingEndLongitudeSecond() && getGearShootingEndLongitudeSecond() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + +</validators> Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-07 22:58:44 UTC (rev 156) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-08 09:28:42 UTC (rev 157) @@ -4,7 +4,6 @@ tutti.action.about.tip=À Propos tutti.action.cancel=Annuler tutti.action.casino-import=Import Casino -tutti.action.catches=Captures tutti.action.close=Fermer tutti.action.configuration=Configuration tutti.action.configuration.tip=Configurer Tutti @@ -12,7 +11,7 @@ tutti.action.edit=Editer tutti.action.exit=Quitter tutti.action.exit.tip=Quitter l'application -tutti.action.fillCatches=Captures +tutti.action.fillCatches=Saisir les captures tutti.action.fillCatches.tip=Saisir des captures tutti.action.generate=Générer tutti.action.generateCampaignName=Générer le nom @@ -33,6 +32,8 @@ tutti.action.site=Site tutti.action.site.tip=Accéder au site du projet Tutti tutti.action.splitSpeciesBatch=Catégoriser un lot +tutti.action.validateCatches=Valider les captures +tutti.action.validateCatches.tip=Valider les captures tutti.application.config=Configuration de l'application Tutti tutti.application.name=Tutti tutti.config.category.applications=Application @@ -187,7 +188,6 @@ tutti.table.benthos.batch.header.speciesByGenusCode=Espèce tutti.table.benthos.batch.header.toConfirm=A Confirmer tutti.table.benthos.batch.header.weight=Poids -tutti.table.fishing.caracteristic.header.key= tutti.table.fishing.environment.header.key=Clé tutti.table.fishing.environment.header.value=Valeur tutti.table.fishing.gearShooting.header.key=Clé @@ -255,6 +255,7 @@ tutti.title.selectedProgram=Série de campagne %s tutti.title.selectedProtocol=Protocol %s tutti.title.splitBatch=Catégoriser un lot +tutti.title.validate.operations=Validation des opérations de pêches (%s) tutti.to.be.done=< A FAIRE > tutti.tooltip.attachment.none=Pas de pièce-jointes tutti.tooltip.comment.none=Pas de commentaire Added: trunk/tutti-ui-swing/src/main/resources/icons/action-validate.png =================================================================== (Binary files differ) Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-validate.png ___________________________________________________________________ Added: svn:mime-type + image/png

1 0

r156 - in trunk: . tutti-persistence/src/main/java/fr/ifremer/tutti/persistence tutti-persistence-adagio tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config tutti-persistence-adagio/src/main/resources tutti-persistence-adagio/src/main/resources/META-INF/services tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence tutti-persistence-adagio/src/test/resources tutti-persistence-dev/src/main
by tchemit＠users.forge.codelutin.com Jan. 7, 2013

Jan. 7, 2013

Author: tchemit Date: 2013-01-07 23:58:44 +0100 (Mon, 07 Jan 2013) New Revision: 156 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/156 Log: refs #1807: [Persistence] Adagio r?\195?\169f?\195?\169rentiel (mise en place technique) Added: trunk/tutti-persistence-adagio/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider trunk/tutti-persistence-adagio/src/main/resources/tutti-db-conf.properties trunk/tutti-persistence-adagio/src/main/resources/tutti-db-enumerations.properties trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/TestUtil.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImplTest.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java Removed: trunk/tutti-persistence-adagio/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.TuttiPersistence trunk/tutti-persistence-adagio/src/test/resources/conf.properties trunk/tutti-persistence-dev/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.TuttiPersistence Modified: trunk/pom.xml trunk/tutti-persistence-adagio/pom.xml trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioConfig.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioConfigOption.java trunk/tutti-persistence-adagio/src/main/resources/applicationContext-service-tutti.xml trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/BaseDaoTest.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/GearDaoTest.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/ProgramDaoTest.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/VesselDaoTest.java trunk/tutti-persistence-adagio/src/test/resources/tutti-test.properties trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java trunk/tutti-persistence-dev/src/test/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImplTest.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java trunk/tutti-service/pom.xml trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfig.java trunk/tutti-ui-swing/pom.xml trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfig.java trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-warning-validation.xml trunk/tutti-ui-swing/src/main/resources/log4j.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-07 16:42:45 UTC (rev 155) +++ trunk/pom.xml 2013-01-07 22:58:44 UTC (rev 156) @@ -38,7 +38,7 @@ <modules> <module>tutti-persistence</module> <module>tutti-persistence-dev</module> -  + <module>tutti-persistence-adagio</module> <module>tutti-service</module> <module>tutti-ui-swing</module> </modules> @@ -77,6 +77,17 @@ </roles> <timezone>Europe/Paris</timezone> </developer> + <developer> + <id>morin</id> + <name>Kevin Morin</name> + <email>morin at codelutin dot com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <roles> + <role>developer</role> + </roles> + <timezone>Europe/Paris</timezone> + </developer> </developers> <scm> @@ -105,7 +116,7 @@  - <nuitonUtilsVersion>2.6.5</nuitonUtilsVersion> + <nuitonUtilsVersion>2.7-SNAPSHOT</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <eugenePluginVersion>2.6</eugenePluginVersion> @@ -122,7 +133,7 @@ <adagioVersion>3.3.1-SNAPSHOT</adagioVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> - + <i18n.bundles>fr_FR</i18n.bundles> <i18n.silent>true</i18n.silent> @@ -204,13 +215,13 @@ <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-validator</artifactId> <version>${jaxxVersion}</version> - </dependency> + </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets</artifactId> <version>${jaxxVersion}</version> - </dependency> + </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> @@ -370,11 +381,9 @@ <scope>test</scope> </dependency> -  <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> - <scope>runtime</scope> <version>${jdbc.hsqldb.version}</version> </dependency> @@ -405,6 +414,16 @@ <artifactId>doxia-module-jrst</artifactId> <version>${jrstPluginVersion}</version> </dependency> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>${jdbc.hsqldb.version}</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernateVersion}</version> + </dependency> </dependencies> </plugin> @@ -482,13 +501,13 @@ <profiles> <profile> - <id>license-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> + <id>license-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> <build> <defaultGoal>generate-resources</defaultGoal> @@ -504,8 +523,12 @@ </goals> <phase>generate-resources</phase> <configuration> - <roots><root>${project.basedir}</root></roots> - <includes><include>pom.xml</include></includes> + <roots> + <root>${project.basedir}</root> + </roots> + <includes> + <include>pom.xml</include> + </includes> <addSvnKeyWords>false</addSvnKeyWords> <verbose>false</verbose> </configuration> Added: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java (rev 0) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java 2013-01-07 22:58:44 UTC (rev 156) @@ -0,0 +1,183 @@ +package fr.ifremer.tutti.persistence; + +/* + * #%L + * Tutti :: Persistence API + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.common.base.Preconditions; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; +import com.google.common.collect.Lists; +import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.Enumeration; +import java.util.List; + +/** + * A class loader that search first in a given directory before in parent + * class loader. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class RessourceClassLoader extends ClassLoader { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(RessourceClassLoader.class); + + public static final URL[] EMPTY_URL_ARRAY = new URL[0]; + + protected URLClassLoader loader; + + protected Predicate<String> searchInDirectoriesPredicate; + + protected final List<File> directories; + + public RessourceClassLoader(ClassLoader parent) { + super(parent); + + // by default try in directories if there is some + this.searchInDirectoriesPredicate = new Predicate<String>() { + @Override + public boolean apply(String input) { + return !directories.isEmpty(); + } + }; + directories = Lists.newArrayList(); + loader = URLClassLoader.newInstance(EMPTY_URL_ARRAY); + } + + public void addDirectory(File... directories) throws IOException { + for (File directory : directories) { + if (!this.directories.contains(directory)) { + this.directories.add(directory); + } + } + loader = null; + } + + public void removeDirectory(File... directories) { + for (File directory : directories) { + this.directories.remove(directory); + } + loader = null; + } + + public Predicate<String> getSearchInDirectoriesPredicate() { + return searchInDirectoriesPredicate; + } + + public void addSearchInDirectoriesPredicate(Predicate<String> predicate) { + Preconditions.checkNotNull(predicate, + "search predicate can not be null"); + this.searchInDirectoriesPredicate = Predicates.and(searchInDirectoriesPredicate, predicate); + } + public void setSearchInDirectoriesPredicate(Predicate<String> searchInDirectoriesPredicate) { + Preconditions.checkNotNull(searchInDirectoriesPredicate, + "search predicate can not be null"); + this.searchInDirectoriesPredicate = searchInDirectoriesPredicate; + } + + @Override + public URL findResource(String name) { + URL result = null; + if (searchInDirectoriesPredicate.apply(name)) { + if (log.isInfoEnabled()) { + log.info("findResource [" + name + "] in [" + directories + ']'); + } + result = getLoader().findResource(name); + } + if (result == null) { + result = super.findResource(name); + } + return result; + } + + @Override + public Enumeration<URL> findResources(String name) throws IOException { + Enumeration<URL> result = null; + if (searchInDirectoriesPredicate.apply(name)) { + if (log.isInfoEnabled()) { + log.info("findResources [" + name + "] in [" + directories + ']'); + } + result = getLoader().findResources(name); + } + if (result == null || !result.hasMoreElements()) { + result = super.findResources(name); + } + return result; + } + + @Override + public URL getResource(String name) { + URL result = null; + if (searchInDirectoriesPredicate.apply(name)) { + if (log.isInfoEnabled()) { + log.info("getResource [" + name + "] in [" + + directories + ']'); + } + result = getLoader().getResource(name); + } + if (result == null) { + result = super.getResource(name); + } + return result; + } + + @Override + public Enumeration<URL> getResources(String name) throws IOException { + Enumeration<URL> result = null; + if (searchInDirectoriesPredicate.apply(name)) { + if (log.isInfoEnabled()) { + log.info("getResources [" + name + "] in [" + directories + ']'); + } + result = getLoader().getResources(name); + } + if (result == null || !result.hasMoreElements()) { + result = super.getResources(name); + } + return result; + } + + protected URLClassLoader getLoader() { + if (loader == null) { + try { + URL[] urls = FileUtils.toURLs( + directories.toArray(new File[directories.size()])); + loader = URLClassLoader.newInstance(urls); + } catch (IOException e) { + throw new RuntimeException( + "Could not convert directories " + directories + + " to url.", e); + } + } + return loader; + } +} Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-01-07 16:42:45 UTC (rev 155) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-01-07 22:58:44 UTC (rev 156) @@ -42,11 +42,11 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.entities.referential.Zone; -import org.nuiton.util.ApplicationConfig; import java.io.Closeable; import java.io.IOException; import java.util.List; +import java.util.Properties; /** * Contract for a persistence driver used by Tutti. @@ -62,10 +62,12 @@ String getImplementationName(); - void open(ApplicationConfig config) throws IOException; + void open() throws IOException; void close() throws IOException; + void setEnumerations(Properties dbEnumerations); + //------------------------------------------------------------------------// //-- Referential methods --// //------------------------------------------------------------------------// @@ -237,5 +239,4 @@ AccidentalBatch saveAccidentalBatch(AccidentalBatch bean); void deleteAccidentalBatch(String id); - } Modified: trunk/tutti-persistence-adagio/pom.xml =================================================================== --- trunk/tutti-persistence-adagio/pom.xml 2013-01-07 16:42:45 UTC (rev 155) +++ trunk/tutti-persistence-adagio/pom.xml 2013-01-07 22:58:44 UTC (rev 156) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> @@ -40,17 +40,19 @@ <artifactId>guava</artifactId> </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency--> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java 2013-01-07 16:42:45 UTC (rev 155) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java 2013-01-07 22:58:44 UTC (rev 156) @@ -24,7 +24,9 @@ * #L% */ -import fr.ifremer.tutti.persistence.config.TuttiPersistenceAdagioConfig; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import fr.ifremer.adagio.core.dao.referential.gear.GearImpl; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.Cruise; @@ -35,168 +37,234 @@ import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; +import fr.ifremer.tutti.persistence.entities.referential.AbstractTuttiReferentialEntity; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Country; import fr.ifremer.tutti.persistence.entities.referential.FishingOperationLocation; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.persistence.entities.referential.Status; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.entities.referential.Zone; -import org.apache.commons.io.FileUtils; -import org.nuiton.util.ApplicationConfig; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.springframework.transaction.annotation.Transactional; import java.io.IOException; import java.util.List; +import java.util.Properties; /** * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ +//@TransactionConfiguration(transactionManager = "transactionManager") public class TuttiPersistenceAdagioImpl implements TuttiPersistence { + /** Logger. */ + private static final Log log = + LogFactory.getLog(TuttiPersistenceAdagioImpl.class); + /** - * Persistence config. + * Session factory. * - * @since 0.2 + * @since 0.3 */ - protected TuttiPersistenceAdagioConfig config; + protected SessionFactory sessionFactory; + protected Properties enumerations; + + public void setSessionFactory(SessionFactory sessionFactory) { + this.sessionFactory = sessionFactory; + } + + public void setEnumerations(Properties enumerations) { + this.enumerations = enumerations; + } + @Override public String getImplementationName() { return "Persistence Adagio implementation"; } @Override - public void open(ApplicationConfig config) throws IOException { - this.config = new TuttiPersistenceAdagioConfig(config); - try { - FileUtils.forceMkdir(this.config.getDbDirectory()); - } catch (IOException e) { - throw new RuntimeException("Could not create directory", e); - } + public void open() throws IOException { + Preconditions.checkNotNull(sessionFactory, " No sessionFactory property setted"); + Preconditions.checkNotNull(enumerations, " No enumerations property setted"); } @Override public void close() throws IOException { + + if (log.isInfoEnabled()) { + log.info("Close persistence driver " + getImplementationName()); + } + + sessionFactory.close(); } //------------------------------------------------------------------------// //-- Referential methods --// //------------------------------------------------------------------------// + @Transactional(readOnly = true) @Override public List<Species> getAllSpecies() { return null; } + @Transactional(readOnly = true) @Override + public Species getSpecies(String speciesId) { + return null; + } + + @Transactional(readOnly = true) + @Override public List<FishingOperationLocation> getAllFishingOperationStrata(String zoneId) { return null; } + @Transactional(readOnly = true) @Override public List<FishingOperationLocation> getAllFishingOperationSubStrata(String locationId) { return null; } + @Transactional(readOnly = true) @Override public List<FishingOperationLocation> getAllFishingOperationLocation(String locationId) { return null; } + @Transactional(readOnly = true) @Override public List<Zone> getAllZone() { return null; } + @Transactional(readOnly = true) @Override public List<Country> getAllCountry() { return null; } + @Transactional(readOnly = true) @Override public List<Vessel> getAllVessel() { return null; } + @Transactional(readOnly = true) @Override public List<Gear> getAllGear() { - return null; + Query query = sessionFactory.getCurrentSession().getNamedQuery("getAllGears"); + + List gears = query.list(); + List<Gear> result = Lists.newArrayList(); + for (Object o : gears) { + GearImpl gearImpl = (GearImpl) o; + Gear g = new Gear(); + g.setId(String.valueOf(gearImpl.getId())); + g.setName(gearImpl.getName()); + g.setDescription(gearImpl.getLabel()); + setStatus(gearImpl.getStatus(), g); + result.add(g); + } + return result; } + @Transactional(readOnly = true) @Override public List<Person> getAllPerson() { return null; } + @Transactional(readOnly = true) @Override public List<Caracteristic> getAllFishingOperationEnvironmentCaracteristic() { return null; } + @Transactional(readOnly = true) @Override public List<Caracteristic> getAllFishingOperationGearCaracteristic() { return null; } + @Transactional(readOnly = true) @Override public List<Caracteristic> getAllFishingOperationHydrologicCaracteristic() { return null; } + @Transactional(readOnly = true) @Override - public List<Caracteristic> getAllSpeciesFrequencyCaracteristic() { + public List<Caracteristic> getAllSpeciesLengthStepCaracteristic() { return null; } + @Transactional(readOnly = true) @Override public Caracteristic getSizeCategoryCaracteristic() { return null; } + @Transactional(readOnly = true) @Override public Caracteristic getSexCaracteristic() { return null; } + @Transactional(readOnly = true) @Override public Caracteristic getSortedUnsortedCaracteristic() { return null; } + @Transactional(readOnly = true) @Override public Caracteristic getMaturityCaracteristic() { return null; } + @Transactional(readOnly = true) @Override public Caracteristic getMacroWasteCategoryCaracteristic() { return null; } + @Transactional(readOnly = true) + @Override + public Caracteristic getMacroWasteSizeCategoryCaracteristic() { + return null; + } + //------------------------------------------------------------------------// //-- Program methods --// //------------------------------------------------------------------------// @Override public List<Program> getAllProgram() { - return null; + throw new UnsupportedOperationException(); } @Override public Program getProgram(String id) { - return null; + throw new UnsupportedOperationException(); } @Override public Program createProgram(Program bean) { - return null; + throw new UnsupportedOperationException(); } @Override public Program saveProgram(Program bean) { - return null; + throw new UnsupportedOperationException(); } //------------------------------------------------------------------------// @@ -205,22 +273,22 @@ @Override public List<Cruise> getAllCruise(String programId) { - return null; + throw new UnsupportedOperationException(); } @Override public Cruise getCruise(String id) { - return null; + throw new UnsupportedOperationException(); } @Override public Cruise createCruise(Cruise bean) { - return null; + throw new UnsupportedOperationException(); } @Override public Cruise saveCruise(Cruise bean) { - return null; + throw new UnsupportedOperationException(); } //------------------------------------------------------------------------// @@ -229,22 +297,22 @@ @Override public List<TuttiProtocol> getAllProtocol() { - return null; + throw new UnsupportedOperationException(); } @Override public TuttiProtocol getProtocol(String id) { - return null; + throw new UnsupportedOperationException(); } @Override public TuttiProtocol createProtocol(TuttiProtocol bean) { - return null; + throw new UnsupportedOperationException(); } @Override public TuttiProtocol saveProtocol(TuttiProtocol bean) { - return null; + throw new UnsupportedOperationException(); } //------------------------------------------------------------------------// @@ -253,60 +321,74 @@ @Override public List<FishingOperation> getAllFishingOperation(String cruiseId) { - return null; + throw new UnsupportedOperationException(); } @Override public FishingOperation getFishingOperation(String id) { - return null; + throw new UnsupportedOperationException(); } @Override public FishingOperation createFishingOperation(FishingOperation bean) { - return null; + throw new UnsupportedOperationException(); } @Override public FishingOperation saveFishingOperation(FishingOperation bean) { - return null; + throw new UnsupportedOperationException(); } //------------------------------------------------------------------------// //-- Species Batch methods --// //------------------------------------------------------------------------// + @Override + public List<SpeciesBatch> getAllRootSpeciesBatch(String fishingOperationId) { + throw new UnsupportedOperationException(); + } + + @Override public List<SpeciesBatch> getAllSpeciesBatch(String fishingOperationId) { - return null; + throw new UnsupportedOperationException(); } @Override public SpeciesBatch getSpeciesBatch(String id) { - return null; + throw new UnsupportedOperationException(); } @Override - public SpeciesBatch createSpeciesBatch(SpeciesBatch bean) { - return null; + public SpeciesBatch createSpeciesBatch(SpeciesBatch bean, + String parentBatchId) { + throw new UnsupportedOperationException(); } @Override public SpeciesBatch saveSpeciesBatch(SpeciesBatch bean) { - return null; + throw new UnsupportedOperationException(); } @Override public void deleteSpeciesBatch(String id) { + throw new UnsupportedOperationException(); } @Override + public void deleteSpeciesSubBatch(String id) { + throw new UnsupportedOperationException(); + } + + @Override public List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency(String speciesBatchId) { - return null; + throw new UnsupportedOperationException(); } @Override - public List<SpeciesBatchFrequency> saveSpeciesBatchFrequency(String speciesBatchId, List<SpeciesBatchFrequency> frequencies) { - return null; + public List<SpeciesBatchFrequency> saveSpeciesBatchFrequency(String speciesBatchId, + List<SpeciesBatchFrequency> frequencies) { + throw new UnsupportedOperationException(); } //------------------------------------------------------------------------// @@ -315,26 +397,27 @@ @Override public List<BenthosBatch> getAllBenthosBatch(String fishingOperationId) { - return null; + throw new UnsupportedOperationException(); } @Override public BenthosBatch getBenthosBatch(String id) { - return null; + throw new UnsupportedOperationException(); } @Override public BenthosBatch createBenthosBatch(BenthosBatch bean) { - return null; + throw new UnsupportedOperationException(); } @Override public BenthosBatch saveBenthosBatch(BenthosBatch bean) { - return null; + throw new UnsupportedOperationException(); } @Override public void deleteBenthosBatch(String id) { + throw new UnsupportedOperationException(); } //------------------------------------------------------------------------// @@ -343,26 +426,27 @@ @Override public List<PlanktonBatch> getAllPlanktonBatch(String fishingOperationId) { - return null; + throw new UnsupportedOperationException(); } @Override public PlanktonBatch getPlanktonBatch(String id) { - return null; + throw new UnsupportedOperationException(); } @Override public PlanktonBatch createPlanktonBatch(PlanktonBatch bean) { - return null; + throw new UnsupportedOperationException(); } @Override public PlanktonBatch savePlanktonBatch(PlanktonBatch bean) { - return null; + throw new UnsupportedOperationException(); } @Override public void deletePlanktonBatch(String id) { + throw new UnsupportedOperationException(); } //------------------------------------------------------------------------// @@ -371,26 +455,27 @@ @Override public List<MacroWasteBatch> getAllMacroWasteBatch(String fishingOperationId) { - return null; + throw new UnsupportedOperationException(); } @Override public MacroWasteBatch getMacroWasteBatch(String id) { - return null; + throw new UnsupportedOperationException(); } @Override public MacroWasteBatch createMacroWasteBatch(MacroWasteBatch bean) { - return null; + throw new UnsupportedOperationException(); } @Override public MacroWasteBatch saveMacroWasteBatch(MacroWasteBatch bean) { - return null; + throw new UnsupportedOperationException(); } @Override public void deleteMacroWasteBatch(String id) { + throw new UnsupportedOperationException(); } //------------------------------------------------------------------------// @@ -399,25 +484,37 @@ @Override public List<AccidentalBatch> getAllAccidentalBatch(String fishingOperationId) { - return null; + throw new UnsupportedOperationException(); } @Override public AccidentalBatch getAccidentalBatch(String id) { - return null; + throw new UnsupportedOperationException(); } @Override public AccidentalBatch createAccidentalBatch(AccidentalBatch bean) { - return null; + throw new UnsupportedOperationException(); } @Override public AccidentalBatch saveAccidentalBatch(AccidentalBatch bean) { - return null; + throw new UnsupportedOperationException(); } @Override public void deleteAccidentalBatch(String id) { + throw new UnsupportedOperationException(); } + + //------------------------------------------------------------------------// + //-- Internal methods --// + //------------------------------------------------------------------------// + + protected <E extends AbstractTuttiReferentialEntity> void setStatus(fr.ifremer.adagio.core.dao.referential.Status status, E entity) { + Status newStatus = new Status(); + newStatus.setId(status.getCode()); + newStatus.setName(status.getName()); + entity.setStatus(newStatus); + } } Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioConfig.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioConfig.java 2013-01-07 16:42:45 UTC (rev 155) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioConfig.java 2013-01-07 22:58:44 UTC (rev 156) @@ -24,9 +24,24 @@ * #L% */ +import com.google.common.base.Charsets; +import com.google.common.base.Predicate; +import com.google.common.collect.Sets; +import com.google.common.io.Files; +import fr.ifremer.tutti.persistence.RessourceClassLoader; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; +import java.io.BufferedReader; +import java.io.BufferedWriter; import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; +import java.util.Set; /** * Configuration for the persistence driver. @@ -36,31 +51,194 @@ */ public class TuttiPersistenceAdagioConfig { + /** Logger. */ + private static final Log log = + LogFactory.getLog(TuttiPersistenceAdagioConfig.class); + protected final ApplicationConfig config; public TuttiPersistenceAdagioConfig(ApplicationConfig config) { this.config = config; - config.loadDefaultOptions(TuttiPersistenceAdagioConfigOption.values()); } + public void initConfig(RessourceClassLoader resourceLoader) throws IOException { + try { + FileUtils.forceMkdir(getDbDirectory()); + } catch (Exception e) { + throw new RuntimeException("Could not create directory", e); + } + + // add a predicate to search the configuration file from his directory instead of the class-path + resourceLoader.addSearchInDirectoriesPredicate(new Predicate<String>() { + + Set<String> matchingNames = Sets.newHashSet( + getDbConfigurationPath().getName(), + getDbEnumerationPath().getName()); + + @Override + public boolean apply(String input) { + return matchingNames.contains(input); + } + }); + + // get configuration file path + File configurationPath = getDbConfigurationPath(); + + // add his directory in path to search + resourceLoader.addDirectory(configurationPath.getParentFile()); + + // generate configuration file if required + generateDbConfiguration(configurationPath); + + // get enumeration file path + File enumerationPath = getDbEnumerationPath(); + + // add his directory in path to search + resourceLoader.addDirectory(enumerationPath.getParentFile()); + + generateDbEnumerationConfiguration(enumerationPath); + } + + public File getDbConfigurationPath() { + return config.getOptionAsFile(TuttiPersistenceAdagioConfigOption.DB_CONFIGURATION_PATH.getKey()); + } + public File getDbDirectory() { - return config.getOptionAsFile(TuttiPersistenceAdagioConfigOption.DB_PATH.getKey()); + return config.getOptionAsFile(TuttiPersistenceAdagioConfigOption.DB_DIRECTORY.getKey()); } public File getDbName() { return config.getOptionAsFile(TuttiPersistenceAdagioConfigOption.DB_NAME.getKey()); } - public File getDbConfigurationPath() { - return config.getOptionAsFile(TuttiPersistenceAdagioConfigOption.DB_CONFIGURATION_PATH.getKey()); + public File getDbEnumerationPath() { + return config.getOptionAsFile(TuttiPersistenceAdagioConfigOption.DB_ENUMERATION_PATH.getKey()); } - public File getDbMappingPath() { - return config.getOptionAsFile(TuttiPersistenceAdagioConfigOption.BB_MAPPING_PATH.getKey()); + public String getJdbcUrl() { + return config.getOption(TuttiPersistenceAdagioConfigOption.JDBC_URL.getKey()); } + public Class getJdbcDriver() { + return config.getOptionAsClass(TuttiPersistenceAdagioConfigOption.JDBC_DRIVER.getKey()); + } + + public String getJdbcUsername() { + return config.getOption(TuttiPersistenceAdagioConfigOption.JDBC_USERNAME.getKey()); + } + + public String getJdbcPassword() { + return config.getOption(TuttiPersistenceAdagioConfigOption.JDBC_PASSWORD.getKey()); + } + + public Class getHibernateDialect() { + return config.getOptionAsClass(TuttiPersistenceAdagioConfigOption.HIBERNATE_DIALECT.getKey()); + } + + public boolean isHibernateShowSql() { + Boolean result = config.getOptionAsBoolean(TuttiPersistenceAdagioConfigOption.HIBERNATE_SHOW_SQL.getKey()); + return result != null && result; + } + + public boolean isHibernateUseSqlComment() { + Boolean result = config.getOptionAsBoolean(TuttiPersistenceAdagioConfigOption.HIBERNATE_USE_SQL_COMMENT.getKey()); + return result != null && result; + } + + public boolean isHibernateFormatSql() { + Boolean result = config.getOptionAsBoolean(TuttiPersistenceAdagioConfigOption.HIBERNATE_FORMAT_SQL.getKey()); + return result != null && result; + } + public ApplicationConfig getConfig() { return config; } + public void generateDbConfiguration(File destination) throws IOException { + + if (!destination.exists()) { + + // load db configuration template (tutti-db.properties) + + if (log.isInfoEnabled()) { + log.info("Generate " + destination + " from classpath."); + } + Properties result = new Properties(); + InputStream in = getClass().getResourceAsStream("/tutti-db-conf.properties"); + try { + result.load(in); + in.close(); + } finally { + IOUtils.closeQuietly(in); + } + + // replace some values from ApplicationConfig + + result.put("dataSource.jdbc.driver", getJdbcDriver().getName()); + result.put("dataSource.jdbc.username", getJdbcUsername()); + result.put("dataSource.jdbc.password", getJdbcPassword()); + result.put("dataSource.jdbc.url", getJdbcUrl()); + result.put("hibernate.dialect", getHibernateDialect().getName()); + result.put("hibernate.show_sql", isHibernateShowSql() + ""); + result.put("hibernate.format_sql", isHibernateFormatSql() + ""); + result.put("hibernate.use_sql_comments", isHibernateUseSqlComment() + ""); + + // write result file at destination + + BufferedWriter writer = Files.newWriter(destination, Charsets.UTF_8); + try { + result.store(writer, "Generated by " + getClass().getName()); + writer.close(); + } finally { + IOUtils.closeQuietly(writer); + } + } + } + + public void generateDbEnumerationConfiguration(File destination) throws IOException { + + if (!destination.exists()) { + + // load enumeration mapping from classpath (enumerations.properties) + + if (log.isInfoEnabled()) { + log.info("Generate " + destination + " from classpath."); + } + + Properties result = new Properties(); + InputStream in = getClass().getResourceAsStream("/tutti-db-enumerations.properties"); + try { + result.load(in); + in.close(); + } finally { + IOUtils.closeQuietly(in); + } + + // replace some values from ApplicationConfig + + + // write result file at destination + + BufferedWriter writer = + Files.newWriter(destination, Charsets.UTF_8); + try { + result.store(writer, "Generated by " + getClass().getName()); + writer.close(); + } finally { + IOUtils.closeQuietly(writer); + } + } + } + + public Properties getDbEnumerations() throws IOException { + Properties result = new Properties(); + BufferedReader in = Files.newReader(getDbEnumerationPath(), Charsets.UTF_8); + try { + result.load(in); + in.close(); + } finally { + IOUtils.closeQuietly(in); + } + return result; + } } \ No newline at end of file Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioConfigOption.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioConfigOption.java 2013-01-07 16:42:45 UTC (rev 155) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioConfigOption.java 2013-01-07 22:58:44 UTC (rev 156) @@ -24,6 +24,8 @@ * #L% */ +import org.hibernate.dialect.HSQLDialect; +import org.hsqldb.jdbcDriver; import org.nuiton.util.ApplicationConfig; import java.io.File; @@ -36,32 +38,92 @@ */ public enum TuttiPersistenceAdagioConfigOption implements ApplicationConfig.OptionDef { - DB_PATH("tutti.persistence.dbPath", + DB_CONFIGURATION_PATH( + "tutti.persistence.db.configurationPath", + "Chemin du fichier de configuration d'Adagio", + "${tutti.data.directory}/conf.properties", + File.class, + true, + true), + + DB_DIRECTORY( + "tutti.persistence.db.directory", "Répertoire où est la base de données", "${tutti.data.directory}/db", File.class, true, true), - DB_NAME("tutti.persistence.dbName", + DB_NAME( + "tutti.persistence.db.name", "Nom du fichier de la base de données", - "tutti", + "allegro", String.class, true, true), + DB_ENUMERATION_PATH( + "tutti.persistence.db.enumerationPath", + "Chemin du fichier de correspondance des énumérations", + "${tutti.data.directory}/enumerations.properties", + File.class, + true, + true), + JDBC_USERNAME( + "tutti.persistence.jdbc.username", + "Login de l'utilisateur pour se connecter à la base de données", + "sa", + String.class, + true, + true), + JDBC_PASSWORD( + "tutti.persistence.jdbc.password", + "Mot de passe de l'utilisateur pour se connecter à la base de données", + "", + String.class, + true, + true), + JDBC_URL( + "tutti.persistence.jdbc.url", + "URL de connexion à la base de données", + "jdbc:hsqldb:file:${tutti.persistence.db.directory}/${tutti.persistence.db.name}", + String.class, + true, + true), + JDBC_DRIVER( + "tutti.persistence.jdbc.driver", + "Le pilote JDBC utilisé pour communiquer avec la base de données", + jdbcDriver.class.getName(), + Class.class, + true, + true), + HIBERNATE_DIALECT( + "tutti.persistence.hibernate.dialect", + "Le dialect hibernate utilisée pour communiquer avec la base de données", + HSQLDialect.class.getName(), + Class.class, + true, + true), + HIBERNATE_SHOW_SQL( + "tutti.persistence.hibernate.showSql", + "Option pour afficher ou non les requète sql dans les logs", + Boolean.FALSE.toString(), + boolean.class, + true, + true), + HIBERNATE_USE_SQL_COMMENT( + "tutti.persistence.hibernate.useSqlComment", + "Option pour ajouter les commentaires dans les requètes sql générées", + Boolean.FALSE.toString(), + boolean.class, + true, + true), + HIBERNATE_FORMAT_SQL( + "tutti.persistence.hibernate.formatSql", + "Option pour ajouter les commentaires dans les requètes sql générées", + Boolean.FALSE.toString(), + boolean.class, + true, + true); - DB_CONFIGURATION_PATH("tutti.persistence.dbConfigurationµPath", - "Chemin du fichier de configuration de la base", - "${tutti.data.directory}/dbConfiguration.properties", - File.class, - true, - true), - BB_MAPPING_PATH("tutti.persistence.dbMappingPath", - "Chemin du fichier de mapping des constantes de la base", - "${tutti.data.directory}/dbMapping.properties", - File.class, - true, - true); - /** Configuration key. */ private final String key; Deleted: trunk/tutti-persistence-adagio/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.TuttiPersistence =================================================================== --- trunk/tutti-persistence-adagio/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.TuttiPersistence 2013-01-07 16:42:45 UTC (rev 155) +++ trunk/tutti-persistence-adagio/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.TuttiPersistence 2013-01-07 22:58:44 UTC (rev 156) @@ -1 +0,0 @@ -fr.ifremer.tutti.persistence.TuttiPersistenceAdagioImpl \ No newline at end of file Added: trunk/tutti-persistence-adagio/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider =================================================================== --- trunk/tutti-persistence-adagio/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider (rev 0) +++ trunk/tutti-persistence-adagio/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider 2013-01-07 22:58:44 UTC (rev 156) @@ -0,0 +1 @@ +fr.ifremer.tutti.persistence.config.TuttiPersistenceAdagioProvider \ No newline at end of file Property changes on: trunk/tutti-persistence-adagio/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-persistence-adagio/src/main/resources/applicationContext-service-tutti.xml =================================================================== --- trunk/tutti-persistence-adagio/src/main/resources/applicationContext-service-tutti.xml 2013-01-07 16:42:45 UTC (rev 155) +++ trunk/tutti-persistence-adagio/src/main/resources/applicationContext-service-tutti.xml 2013-01-07 22:58:44 UTC (rev 156) @@ -35,12 +35,12 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - <context:component-scan base-package="fr.ifremer.adagio.core.service" /> +   - <context:annotation-config /> +   @@ -50,8 +50,13 @@ from outside) --> <tx:annotation-driven transaction-manager="transactionManager" /> + <bean id="adagioPersistenceService" destroy-method="close" + class="fr.ifremer.tutti.persistence.TuttiPersistenceAdagioImpl"> + <property name="sessionFactory" ref="sessionFactory" /> + </bean> +  - <aop:aspectj-autoproxy /> +  </beans> \ No newline at end of file Modified: trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml =================================================================== --- trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml 2013-01-07 16:42:45 UTC (rev 155) +++ trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml 2013-01-07 22:58:44 UTC (rev 156) @@ -26,6 +26,11 @@ <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping> + +  +  +  +  + <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> Modified: trunk/tutti-ui-swing/src/main/resources/log4j.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/log4j.properties 2013-01-07 16:42:45 UTC (rev 155) +++ trunk/tutti-ui-swing/src/main/resources/log4j.properties 2013-01-07 22:58:44 UTC (rev 156) @@ -38,3 +38,4 @@ # tutti levels log4j.logger.fr.ifremer=INFO +log4j.logger.org.nuiton.util=INFO

1 0

r155 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation
by kmorin＠users.forge.codelutin.com Jan. 7, 2013

Jan. 7, 2013

Author: kmorin Date: 2013-01-07 17:42:45 +0100 (Mon, 07 Jan 2013) New Revision: 155 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/155 Log: refs #1899 [Ecran Trait] Cr?\195?\169er un ?\195?\169diteur de position spatiale add popup on the DMS editors Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-01-07 16:38:05 UTC (rev 154) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-01-07 16:42:45 UTC (rev 155) @@ -154,16 +154,12 @@ } .degree { - autoPopup: false; - showPopupButton: false; showReset: false; useFloat: false; useSign: true; } .minute { - autoPopup: false; - showPopupButton: false; showReset: false; useFloat: false; useSign: false; @@ -171,8 +167,6 @@ } .second { - autoPopup: false; - showPopupButton: false; showReset: false; useFloat: false; useSign: false;

1 0

r154 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation resources resources/fr/ifremer/tutti/ui/swing/content/operation resources/i18n
by kmorin＠users.forge.codelutin.com Jan. 7, 2013

Jan. 7, 2013

Author: kmorin Date: 2013-01-07 17:38:05 +0100 (Mon, 07 Jan 2013) New Revision: 154 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/154 Log: refs #1899 [Ecran Trait] Cr?\195?\169er un ?\195?\169diteur de position spatiale validation Added: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-warning-validation.xml Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-error-validation.xml trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties trunk/tutti-ui-swing/src/main/resources/validators.xml Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-01-04 17:38:11 UTC (rev 153) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-01-07 16:38:05 UTC (rev 154) @@ -149,13 +149,16 @@ buttonGroup: "gearShootingCoordinates"; } +CardLayout2Ext { + selected: {model.isUseSexagecimalFormat() ? "DMS" : "DD"}; +} + .degree { autoPopup: false; showPopupButton: false; showReset: false; useFloat: false; useSign: true; - numberPattern: {"-?" + INT_3_DIGITS_PATTERN}; } .minute { @@ -176,9 +179,14 @@ numberPattern: {INT_2_DIGITS_PATTERN}; } +#gearShootingStartLongitudePanel { + layout:{gearShootingStartLongitudeLayout}; +} + #gearShootingStartLongitudeDMSDegreeField { property: gearShootingStartLongitudeDegree; model: {model.getGearShootingStartLongitudeDegree()}; + numberPattern: {"-?" + INT_3_DIGITS_PATTERN}; } #gearShootingStartLongitudeDMSMinuteField { @@ -199,9 +207,14 @@ useSign: true; } +#gearShootingStartLatitudePanel { + layout:{gearShootingStartLatitudeLayout}; +} + #gearShootingStartLatitudeDMSDegreeField { property: gearShootingStartLatitudeDegree; model: {model.getGearShootingStartLatitudeDegree()}; + numberPattern: {"-?" + INT_2_DIGITS_PATTERN}; } #gearShootingStartLatitudeDMSMinuteField { @@ -232,9 +245,14 @@ date: {model.getGearShootingStartDate()}; } +#gearShootingEndLongitudePanel { + layout:{gearShootingEndLongitudeLayout}; +} + #gearShootingEndLongitudeDMSDegreeField { property: gearShootingEndLongitudeDegree; model: {model.getGearShootingEndLongitudeDegree()}; + numberPattern: {"-?" + INT_3_DIGITS_PATTERN}; } #gearShootingEndLongitudeDMSMinuteField { @@ -255,9 +273,14 @@ useSign: true; } +#gearShootingEndLatitudePanel { + layout:{gearShootingEndLatitudeLayout}; +} + #gearShootingEndLatitudeDMSDegreeField { property: gearShootingEndLatitudeDegree; model: {model.getGearShootingEndLatitudeDegree()}; + numberPattern: {"-?" + INT_2_DIGITS_PATTERN}; } #gearShootingEndLatitudeDMSMinuteField { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2013-01-04 17:38:11 UTC (rev 153) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2013-01-07 16:38:05 UTC (rev 154) @@ -39,6 +39,7 @@ jaxx.runtime.swing.editor.bean.BeanDoubleList jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.TimeEditor + jaxx.runtime.swing.CardLayout2Ext jaxx.runtime.validator.swing.SwingValidatorUtil jaxx.runtime.validator.swing.SwingValidatorMessageTableModel @@ -47,7 +48,6 @@ org.jdesktop.swingx.JXTable java.awt.Dimension - java.awt.CardLayout javax.swing.DefaultListModel javax.swing.ListSelectionModel @@ -75,7 +75,9 @@ <SwingValidatorMessageTableModel id='errorTableModel'/> - <BeanValidator id='validator' bean='model' errorTableModel='errorTableModel' + <BeanValidator id='validator' + bean='model' + errorTableModel='errorTableModel' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> <field name='stationNumber' component='stationNumberField'/> <field name='fishingOperationNumber' @@ -83,8 +85,33 @@ <field name='date' component='dateField'/> <field name='comment' component='commentField'/> <field name='saisisseur' component='saisisseurList'/> + <field name='gearShootingStartLatitude' component='gearShootingStartLatitudeDDField'/> + <field name='gearShootingStartLatitudeDegree' component='gearShootingStartLatitudeDMSDegreeField'/> + <field name='gearShootingStartLatitudeMinute' component='gearShootingStartLatitudeDMSMinuteField'/> + <field name='gearShootingStartLatitudeSecond' component='gearShootingStartLatitudeDMSSecondField'/> + <field name='gearShootingStartLongitude' component='gearShootingStartLongitudeDDField'/> + <field name='gearShootingStartLongitudeDegree' component='gearShootingStartLongitudeDMSDegreeField'/> + <field name='gearShootingStartLongitudeMinute' component='gearShootingStartLongitudeDMSMinuteField'/> + <field name='gearShootingStartLongitudeSecond' component='gearShootingStartLongitudeDMSSecondField'/> + <field name='gearShootingEndLatitude' component='gearShootingEndLatitudeDDField'/> + <field name='gearShootingEndLatitudeDegree' component='gearShootingEndLatitudeDMSDegreeField'/> + <field name='gearShootingEndLatitudeMinute' component='gearShootingEndLatitudeDMSMinuteField'/> + <field name='gearShootingEndLatitudeSecond' component='gearShootingEndLatitudeDMSSecondField'/> + <field name='gearShootingEndLongitude' component='gearShootingEndLongitudeDDField'/> + <field name='gearShootingEndLongitudeDegree' component='gearShootingEndLongitudeDMSDegreeField'/> + <field name='gearShootingEndLongitudeMinute' component='gearShootingEndLongitudeDMSMinuteField'/> + <field name='gearShootingEndLongitudeSecond' component='gearShootingEndLongitudeDMSSecondField'/> </BeanValidator> + <CardLayout2Ext id='gearShootingStartLongitudeLayout' + constructorParams='this, "gearShootingStartLongitudePanel"'/> + <CardLayout2Ext id='gearShootingStartLatitudeLayout' + constructorParams='this, "gearShootingStartLatitudePanel"'/> + <CardLayout2Ext id='gearShootingEndLongitudeLayout' + constructorParams='this, "gearShootingEndLongitudePanel"'/> + <CardLayout2Ext id='gearShootingEndLatitudeLayout' + constructorParams='this, "gearShootingEndLatitudePanel"'/> + <JPanel id='fishingOperationPane' constraints='BorderLayout.CENTER' layout='{new BorderLayout()}'> @@ -152,12 +179,14 @@ constraints='BorderLayout.CENTER'> <row> <cell> - <JLabel/> + <JPanel layout="{new GridLayout(1,0)}"> + <JRadioButton id='gearShootingCoordinatesDDRadio' + onActionPerformed='handler.setUseSexagecimalFormat(false)'/> + <JRadioButton id='gearShootingCoordinatesDMSRadio' + onActionPerformed='handler.setUseSexagecimalFormat(true)'/> + </JPanel> </cell> <cell> - <JLabel/> - </cell> - <cell> <JLabel id='gearLatitudeLabel'/> </cell> <cell> @@ -175,12 +204,8 @@ <cell> <JLabel id='gearShootingStartLabel'/> </cell> - <cell> - <JRadioButton id='gearShootingCoordinatesDDRadio' - onActionPerformed='handler.setUseSexagecimalFormat(false)'/> - </cell> <cell weightx='1'> - <JPanel id='gearShootingStartLatitudePanel' layout="{new CardLayout()}"> + <JPanel id='gearShootingStartLatitudePanel'> <NumberEditor id='gearShootingStartLatitudeDDField' constraints='"DD"' constructorParams='this'/> <JPanel layout="{new GridLayout(1,0)}" constraints='"DMS"'> @@ -197,7 +222,7 @@ </JPanel> </cell> <cell weightx='1'> - <JPanel id='gearShootingStartLongitudePanel' layout="{new CardLayout()}"> + <JPanel id='gearShootingStartLongitudePanel'> <NumberEditor id='gearShootingStartLongitudeDDField' constraints='"DD"' constructorParams='this'/> <JPanel layout="{new GridLayout(1,0)}" constraints='"DMS"'> @@ -225,12 +250,8 @@ <cell> <JLabel id='gearShootingEndLabel'/> </cell> - <cell> - <JRadioButton id='gearShootingCoordinatesDMSRadio' - onActionPerformed='handler.setUseSexagecimalFormat(true)'/> - </cell> <cell weightx='1'> - <JPanel id='gearShootingEndLatitudePanel' layout="{new CardLayout()}"> + <JPanel id='gearShootingEndLatitudePanel'> <NumberEditor id='gearShootingEndLatitudeDDField' constraints='"DD"' constructorParams='this'/> <JPanel layout="{new GridLayout(1,0)}" constraints='"DMS"'> @@ -246,7 +267,7 @@ </JPanel> </cell> <cell weightx='1'> - <JPanel id='gearShootingEndLongitudePanel' layout="{new CardLayout()}"> + <JPanel id='gearShootingEndLongitudePanel'> <NumberEditor id='gearShootingEndLongitudeDDField' constraints='"DD"' constructorParams='this'/> <JPanel layout="{new GridLayout(1,0)}" constraints='"DMS"'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-01-04 17:38:11 UTC (rev 153) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-01-07 16:38:05 UTC (rev 154) @@ -52,6 +52,7 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; +import jaxx.runtime.swing.CardLayout2Ext; /** @@ -152,26 +153,11 @@ boolean useSexagecimalFormat = (Boolean) evt.getNewValue(); log.info("property PROPERTY_USE_SEXAGECIMAL_FORMAT changed " + useSexagecimalFormat); - List<JPanel> panels = Lists.newArrayList( - ui.getGearShootingStartLatitudePanel(), - ui.getGearShootingStartLongitudePanel(), - ui.getGearShootingEndLatitudePanel(), - ui.getGearShootingEndLongitudePanel() - ); - - String fieldToShow; if (useSexagecimalFormat) { - fieldToShow = "DMS"; getModel().convertGearShootingCoordinatesDDToDMS(); } else { - fieldToShow = "DD"; getModel().convertGearShootingCoordinatesDMSToDD(); } - - for (JPanel panel : panels) { - CardLayout cardLayout = (CardLayout) panel.getLayout(); - cardLayout.show(panel, fieldToShow); - } } }); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-01-04 17:38:11 UTC (rev 153) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-01-07 16:38:05 UTC (rev 154) @@ -490,7 +490,7 @@ public void setGearShootingEndLongitudeSecond(Integer second) { Object oldValue = getGearShootingEndLongitudeSecond(); - gearShootingStartLongitudeAsSexagecimal.setSeconde(second); + gearShootingEndLongitudeAsSexagecimal.setSeconde(second); firePropertyChange(PROPERTY_GEAR_SHOOTING_END_LONGITUDE_SECOND, oldValue, second); } Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-error-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-error-validation.xml 2013-01-04 17:38:11 UTC (rev 153) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-error-validation.xml 2013-01-07 16:38:05 UTC (rev 154) @@ -34,7 +34,15 @@ </field-validator> </field> + + <field name="fishingOperationNumber"> + <field-validator type="required" short-circuit="true"> + <message>tutti.validator.error.fishingOperation.fishingOperationNumber.required</message> + </field-validator> + + </field> + <field name="date"> <field-validator type="required" short-circuit="true"> Copied: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-warning-validation.xml (from rev 153, trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-error-validation.xml) =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-warning-validation.xml (rev 0) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-warning-validation.xml 2013-01-07 16:38:05 UTC (rev 154) @@ -0,0 +1,298 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> + +<validators> + +  + + <field name="gearShootingStartLatitude"> + + <field-validator type="fieldexpressionwithparams"> + <param name="doubleParams">min:90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat || ( -doubles.min <= gearShootingStartLatitude && gearShootingStartLatitude <= doubles.max ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingStartLatitudeDegree"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:90|max:90</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ( + ( -ints.min < getGearShootingStartLatitudeDegree() && getGearShootingStartLatitudeDegree() < ints.max ) + || ( + ( getGearShootingStartLatitudeDegree() == ints.max || getGearShootingStartLatitudeDegree() == -ints.min ) + && getGearShootingStartLatitudeMinute() == 0 && getGearShootingStartLatitudeSecond() == 0 + ) + ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingStartLatitudeMinute"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingStartLatitudeMinute() && getGearShootingStartLatitudeMinute() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingStartLatitudeSecond"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingStartLatitudeSecond() && getGearShootingStartLatitudeSecond() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + +  + + <field name="gearShootingStartLongitude"> + + <field-validator type="fieldexpressionwithparams"> + <param name="doubleParams">min:180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat || ( -doubles.min <= gearShootingStartLongitude && gearShootingStartLongitude <= doubles.max ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingStartLongitudeDegree"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:180|max:180</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ( + (-ints.min < getGearShootingStartLongitudeDegree() && getGearShootingStartLongitudeDegree() < ints.max) + || ( + ( getGearShootingStartLongitudeDegree() == ints.max || getGearShootingStartLongitudeDegree() == -ints.min ) + && getGearShootingStartLongitudeMinute() == 0 && getGearShootingStartLongitudeSecond() == 0 + ) + ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingStartLongitudeMinute"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingStartLongitudeMinute() && getGearShootingStartLongitudeMinute() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingStartLongitudeSecond"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingStartLongitudeSecond() && getGearShootingStartLongitudeSecond() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + +  + + <field name="gearShootingEndLatitude"> + + <field-validator type="fieldexpressionwithparams"> + <param name="doubleParams">min:90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat || ( -doubles.min <= gearShootingEndLatitude && gearShootingEndLatitude <= doubles.max ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + + <field name="gearShootingEndLatitudeDegree"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:90|max:90</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ( + (-ints.min < getGearShootingEndLatitudeDegree() && getGearShootingEndLatitudeDegree() < ints.max) + || ( + ( getGearShootingEndLatitudeDegree() == ints.max || getGearShootingEndLatitudeDegree() == -ints.min ) + && getGearShootingEndLatitudeMinute() == 0 && getGearShootingEndLatitudeSecond() == 0 + ) + ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingEndLatitudeMinute"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingEndLatitudeMinute() && getGearShootingEndLatitudeMinute() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingEndLatitudeSecond"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingEndLatitudeSecond() && getGearShootingEndLatitudeSecond() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + +  + + <field name="gearShootingEndLongitude"> + + <field-validator type="fieldexpressionwithparams"> + <param name="doubleParams">min:180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat || ( -doubles.min <= gearShootingEndLongitude && gearShootingEndLongitude <= doubles.max ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingEndLongitudeDegree"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:180|max:180</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ( + (-ints.min < getGearShootingEndLongitudeDegree() && getGearShootingEndLongitudeDegree() < ints.max) + || ( + ( getGearShootingEndLongitudeDegree() == ints.max || getGearShootingEndLongitudeDegree() == -ints.min ) + && getGearShootingEndLongitudeMinute() == 0 && getGearShootingEndLongitudeSecond() == 0 + ) + ) + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingEndLongitudeMinute"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingEndLongitudeMinute() && getGearShootingEndLongitudeMinute() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + + <field name="gearShootingEndLongitudeSecond"> + + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">min:0|max:60</param> + <param name="expression"> + <![CDATA[ + useSexagecimalFormat && ints.min <= getGearShootingEndLongitudeSecond() && getGearShootingEndLongitudeSecond() < ints.max + ]]> + </param> + + <message></message> + + </field-validator> + + </field> + +</validators> Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-04 17:38:11 UTC (rev 153) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-07 16:38:05 UTC (rev 154) @@ -273,6 +273,7 @@ tutti.validator.error.cruise.vessel.required=Au moins un bateau doit être sélectionné tutti.validator.error.cruise.year.required=L'année est obligatoire tutti.validator.error.fishingOperation.date.required=La date du fishingOperation est obligatoire +tutti.validator.error.fishingOperation.fishingOperationNumber.required=Le numéro de trait est obligatoire tutti.validator.error.fishingOperation.stationNumber.required=Le numéro de station est obligatoire tutti.validator.error.program.name.required=Le nom de la série est obligatoire tutti.validator.error.program.zone.required=La zone de la série est obligatoire Modified: trunk/tutti-ui-swing/src/main/resources/validators.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/validators.xml 2013-01-04 17:38:11 UTC (rev 153) +++ trunk/tutti-ui-swing/src/main/resources/validators.xml 2013-01-07 16:38:05 UTC (rev 154) @@ -43,5 +43,6 @@ <validator name="email" class="com.opensymphony.xwork2.validator.validators.EmailValidator"/> <validator name="collectionUniqueKey" class="org.nuiton.validator.xwork2.field.CollectionUniqueKeyValidator"/> + <validator name="fieldexpressionwithparams" class="org.nuiton.validator.xwork2.field.FieldExpressionWithParamsValidator"/> </validators>

1 0

r153 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing java/fr/ifremer/tutti/ui/swing/content/operation java/fr/ifremer/tutti/ui/swing/content/protocol resources/i18n
by kmorin＠users.forge.codelutin.com Jan. 4, 2013

Jan. 4, 2013

Author: kmorin Date: 2013-01-04 18:38:11 +0100 (Fri, 04 Jan 2013) New Revision: 153 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/153 Log: refs #1899 [Ecran Trait] Cr?\195?\169er un ?\195?\169diteur de position spatiale Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUI.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUI.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUI.java 2013-01-04 09:13:06 UTC (rev 152) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUI.java 2013-01-04 17:38:11 UTC (rev 153) @@ -46,6 +46,13 @@ public static final String INT_1_DIGITS_PATTERN = "\\d{0,1}"; /** + * Pattern to use for short numeric values in editors with max 2 digits. + * + * @since 0.1 + */ + public static final String INT_2_DIGITS_PATTERN = "\\d{0,2}"; + + /** * Pattern to use for short numeric values in editors with max 3 digits. * * @since 0.1 Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-01-04 09:13:06 UTC (rev 152) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-01-04 17:38:11 UTC (rev 153) @@ -137,14 +137,91 @@ text: "tutti.label.fishingOperation.gearShootingEnd"; } -#gearShootingStartLongitudeField { - text: {getStringValue(model.getGearShootingStartLongitude())}; +#gearShootingCoordinatesDMSRadio { + text: "tutti.label.fishingOperation.gearShootingCoordinatesDMS"; + selected: {model.isUseSexagecimalFormat()}; + buttonGroup: "gearShootingCoordinates"; } -#gearShootingStartLatitudeField { - text: {getStringValue(model.getGearShootingStartLatitude())}; +#gearShootingCoordinatesDDRadio { + text: "tutti.label.fishingOperation.gearShootingCoordinatesDD"; + selected: {!model.isUseSexagecimalFormat()}; + buttonGroup: "gearShootingCoordinates"; } +.degree { + autoPopup: false; + showPopupButton: false; + showReset: false; + useFloat: false; + useSign: true; + numberPattern: {"-?" + INT_3_DIGITS_PATTERN}; +} + +.minute { + autoPopup: false; + showPopupButton: false; + showReset: false; + useFloat: false; + useSign: false; + numberPattern: {INT_2_DIGITS_PATTERN}; +} + +.second { + autoPopup: false; + showPopupButton: false; + showReset: false; + useFloat: false; + useSign: false; + numberPattern: {INT_2_DIGITS_PATTERN}; +} + +#gearShootingStartLongitudeDMSDegreeField { + property: gearShootingStartLongitudeDegree; + model: {model.getGearShootingStartLongitudeDegree()}; +} + +#gearShootingStartLongitudeDMSMinuteField { + property: gearShootingStartLongitudeMinute; + model: {model.getGearShootingStartLongitudeMinute()}; +} + +#gearShootingStartLongitudeDMSSecondField { + property: gearShootingStartLongitudeSecond; + model: {model.getGearShootingStartLongitudeSecond()}; +} + +#gearShootingStartLongitudeDDField { + property: gearShootingStartLongitude; + model: {model.getGearShootingStartLongitude()}; + showReset: false; + useFloat: true; + useSign: true; +} + +#gearShootingStartLatitudeDMSDegreeField { + property: gearShootingStartLatitudeDegree; + model: {model.getGearShootingStartLatitudeDegree()}; +} + +#gearShootingStartLatitudeDMSMinuteField { + property: gearShootingStartLatitudeMinute; + model: {model.getGearShootingStartLatitudeMinute()}; +} + +#gearShootingStartLatitudeDMSSecondField { + property: gearShootingStartLatitudeSecond; + model: {model.getGearShootingStartLatitudeSecond()}; +} + +#gearShootingStartLatitudeDDField { + property: gearShootingStartLatitude; + model: {model.getGearShootingStartLatitude()}; + showReset: false; + useFloat: true; + useSign: true; +} + #gearShootingStartDateField { date: {model.getGearShootingStartDate()}; formats: {"dd/MM/yyyy"}; @@ -155,14 +232,52 @@ date: {model.getGearShootingStartDate()}; } -#gearShootingEndLongitudeField { - text: {getStringValue(model.getGearShootingEndLongitude())}; +#gearShootingEndLongitudeDMSDegreeField { + property: gearShootingEndLongitudeDegree; + model: {model.getGearShootingEndLongitudeDegree()}; } -#gearShootingEndLatitudeField { - text: {getStringValue(model.getGearShootingEndLatitude())}; +#gearShootingEndLongitudeDMSMinuteField { + property: gearShootingEndLongitudeMinute; + model: {model.getGearShootingEndLongitudeMinute()}; } +#gearShootingEndLongitudeDMSSecondField { + property: gearShootingEndLongitudeSecond; + model: {model.getGearShootingEndLongitudeSecond()}; +} + +#gearShootingEndLongitudeDDField { + property: gearShootingEndLongitude; + model: {model.getGearShootingEndLongitude()}; + showReset: false; + useFloat: true; + useSign: true; +} + +#gearShootingEndLatitudeDMSDegreeField { + property: gearShootingEndLatitudeDegree; + model: {model.getGearShootingEndLatitudeDegree()}; +} + +#gearShootingEndLatitudeDMSMinuteField { + property: gearShootingEndLatitudeMinute; + model: {model.getGearShootingEndLatitudeMinute()}; +} + +#gearShootingEndLatitudeDMSSecondField { + property: gearShootingEndLatitudeSecond; + model: {model.getGearShootingEndLatitudeSecond()}; +} + +#gearShootingEndLatitudeDDField { + property: gearShootingEndLatitude; + model: {model.getGearShootingEndLatitude()}; + showReset: false; + useFloat: true; + useSign: true; +} + #gearShootingEndDateField { date: {model.getGearShootingEndDate()}; formats: {"dd/MM/yyyy"}; @@ -195,6 +310,7 @@ selected: {model.getFishingOperationValid() == Boolean.FALSE}; buttonGroup: "fishingOperationValid"; } + #fishingOperationResetRadio { selected: {model.getFishingOperationValid() == null}; buttonGroup: "fishingOperationValid"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2013-01-04 09:13:06 UTC (rev 152) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2013-01-04 17:38:11 UTC (rev 153) @@ -47,6 +47,7 @@ org.jdesktop.swingx.JXTable java.awt.Dimension + java.awt.CardLayout javax.swing.DefaultListModel javax.swing.ListSelectionModel @@ -154,6 +155,9 @@ <JLabel/> </cell> <cell> + <JLabel/> + </cell> + <cell> <JLabel id='gearLatitudeLabel'/> </cell> <cell> @@ -172,13 +176,42 @@ <JLabel id='gearShootingStartLabel'/> </cell> <cell> - <JTextField id='gearShootingStartLatitudeLabel' - onKeyReleased='handler.setGearShootingStartLatitude(((JTextField)event.getSource()).getText())'/> + <JRadioButton id='gearShootingCoordinatesDDRadio' + onActionPerformed='handler.setUseSexagecimalFormat(false)'/> </cell> - <cell> - <JTextField id='gearShootingStartLongitudeField' - onKeyReleased='handler.setGearShootingStartLongitude(((JTextField)event.getSource()).getText())'/> + <cell weightx='1'> + <JPanel id='gearShootingStartLatitudePanel' layout="{new CardLayout()}"> + <NumberEditor id='gearShootingStartLatitudeDDField' constraints='"DD"' + constructorParams='this'/> + <JPanel layout="{new GridLayout(1,0)}" constraints='"DMS"'> + <NumberEditor id='gearShootingStartLatitudeDMSDegreeField' + constructorParams='this' styleClass='degree'/> + + <NumberEditor id='gearShootingStartLatitudeDMSMinuteField' + constructorParams='this' styleClass='minute'/> + + <NumberEditor id='gearShootingStartLatitudeDMSSecondField' + constructorParams='this' styleClass='second'/> + </JPanel> + + </JPanel> </cell> + <cell weightx='1'> + <JPanel id='gearShootingStartLongitudePanel' layout="{new CardLayout()}"> + <NumberEditor id='gearShootingStartLongitudeDDField' constraints='"DD"' + constructorParams='this'/> + <JPanel layout="{new GridLayout(1,0)}" constraints='"DMS"'> + <NumberEditor id='gearShootingStartLongitudeDMSDegreeField' + constructorParams='this' styleClass='degree'/> + + <NumberEditor id='gearShootingStartLongitudeDMSMinuteField' + constructorParams='this' styleClass='minute'/> + + <NumberEditor id='gearShootingStartLongitudeDMSSecondField' + constructorParams='this' styleClass='second'/> + </JPanel> + </JPanel> + </cell> <cell> <JXDatePicker id='gearShootingStartDateField' onActionPerformed='handler.setDate(event, "gearShootingStartDate")'/> @@ -193,13 +226,41 @@ <JLabel id='gearShootingEndLabel'/> </cell> <cell> - <JTextField id='gearShootingEndLatitudeLabel' - onKeyReleased='handler.setGearShootingEndLatitude(((JTextField)event.getSource()).getText())'/> + <JRadioButton id='gearShootingCoordinatesDMSRadio' + onActionPerformed='handler.setUseSexagecimalFormat(true)'/> </cell> - <cell> - <JTextField id='gearShootingEndLongitudeField' - onKeyReleased='handler.setGearShootingEndLongitude(((JTextField)event.getSource()).getText())'/> + <cell weightx='1'> + <JPanel id='gearShootingEndLatitudePanel' layout="{new CardLayout()}"> + <NumberEditor id='gearShootingEndLatitudeDDField' constraints='"DD"' + constructorParams='this'/> + <JPanel layout="{new GridLayout(1,0)}" constraints='"DMS"'> + <NumberEditor id='gearShootingEndLatitudeDMSDegreeField' + constructorParams='this' styleClass='degree'/> + + <NumberEditor id='gearShootingEndLatitudeDMSMinuteField' + constructorParams='this' styleClass='minute'/> + + <NumberEditor id='gearShootingEndLatitudeDMSSecondField' + constructorParams='this' styleClass='second'/> + </JPanel> + </JPanel> </cell> + <cell weightx='1'> + <JPanel id='gearShootingEndLongitudePanel' layout="{new CardLayout()}"> + <NumberEditor id='gearShootingEndLongitudeDDField' constraints='"DD"' + constructorParams='this'/> + <JPanel layout="{new GridLayout(1,0)}" constraints='"DMS"'> + <NumberEditor id='gearShootingEndLongitudeDMSDegreeField' + constructorParams='this' styleClass='degree'/> + + <NumberEditor id='gearShootingEndLongitudeDMSMinuteField' + constructorParams='this' styleClass='minute'/> + + <NumberEditor id='gearShootingEndLongitudeDMSSecondField' + constructorParams='this' styleClass='second'/> + </JPanel> + </JPanel> + </cell> <cell> <JXDatePicker id='gearShootingEndDateField' onActionPerformed='handler.setDate(event, "gearShootingEndDate")'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-01-04 09:13:06 UTC (rev 152) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-01-04 17:38:11 UTC (rev 153) @@ -48,6 +48,7 @@ import javax.swing.JLabel; import javax.swing.JPanel; import java.awt.BorderLayout; +import java.awt.CardLayout; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; @@ -144,11 +145,40 @@ onSelectedSubStrata(source, newStrata); } }); + + model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_USE_SEXAGECIMAL_FORMAT, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + boolean useSexagecimalFormat = (Boolean) evt.getNewValue(); + log.info("property PROPERTY_USE_SEXAGECIMAL_FORMAT changed " + useSexagecimalFormat); + + List<JPanel> panels = Lists.newArrayList( + ui.getGearShootingStartLatitudePanel(), + ui.getGearShootingStartLongitudePanel(), + ui.getGearShootingEndLatitudePanel(), + ui.getGearShootingEndLongitudePanel() + ); + + String fieldToShow; + if (useSexagecimalFormat) { + fieldToShow = "DMS"; + getModel().convertGearShootingCoordinatesDDToDMS(); + } else { + fieldToShow = "DD"; + getModel().convertGearShootingCoordinatesDMSToDD(); + } + + for (JPanel panel : panels) { + CardLayout cardLayout = (CardLayout) panel.getLayout(); + cardLayout.show(panel, fieldToShow); + } + } + }); // listModelIsModify(model); ui.setContextValue(model); - + fishingOperationMonitor.setBean(model); } @@ -263,6 +293,10 @@ return ui.getModel(); } + //------------------------------------------------------------------------// + //-- Public methods --// + //------------------------------------------------------------------------// + public void selectFishingOperation(FishingOperation bean) { if (fishingOperationMonitor.wasModified()) { @@ -277,7 +311,10 @@ log.warn("Won't save new fishing operation, use explicit save button instead..."); } } else { - + if (beanToSave.isUseSexagecimalFormat()) { + beanToSave.convertGearShootingCoordinatesDMSToDD(); + } + // save modified fishing operation FishingOperation toSave = beanToSave.toBean(); @@ -321,6 +358,7 @@ model.setStrata(null); model.setSubStrata(null); model.setLocation(null); + model.convertGearShootingCoordinatesDDToDMS(); if (strata != null) { ui.getStrataComboBox().setSelectedItem(strata); @@ -384,11 +422,14 @@ } public void save() { - + EditFishingOperationUIModel model = getModel(); + // get fishingOperation to save + if (model.isUseSexagecimalFormat()) { + model.convertGearShootingCoordinatesDMSToDD(); + } + FishingOperation toSave = model.toBean(); - FishingOperation toSave = getModel().toBean(); - if (log.isInfoEnabled()) { log.info("Save edition for fishingOperation: " + toSave.getId()); } @@ -412,9 +453,25 @@ //TODO } + public void setUseSexagecimalFormat(boolean useSexagecimalFormat) { + getModel().setUseSexagecimalFormat(useSexagecimalFormat); + } + public void setGearShootingStartLatitude(String text) { getModel().setGearShootingStartLatitude(Float.valueOf(text)); } + + public void setGearShootingStartLatitudeDegree(String text) { + getModel().setGearShootingStartLatitude(Float.valueOf(text)); + } + + public void setGearShootingStartLatitudeMinute(String text) { + getModel().setGearShootingStartLatitude(Float.valueOf(text)); + } + + public void setGearShootingStartLatitudeSecond(String text) { + getModel().setGearShootingStartLatitude(Float.valueOf(text)); + } public void setGearShootingStartLongitude(String text) { getModel().setGearShootingStartLongitude(Float.valueOf(text)); @@ -427,7 +484,11 @@ public void setGearShootingEndLongitude(String text) { getModel().setGearShootingEndLongitude(Float.valueOf(text)); } - + + //------------------------------------------------------------------------// + //-- Protected methods --// + //------------------------------------------------------------------------// + protected void onSelectedStrata(EditFishingOperationUIModel model, FishingOperationLocation newStrata) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-01-04 09:13:06 UTC (rev 152) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-01-04 17:38:11 UTC (rev 153) @@ -31,7 +31,9 @@ import fr.ifremer.tutti.persistence.entities.referential.FishingOperationLocation; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; -import fr.ird.type.SexagecimalPosition; +import fr.ifremer.tutti.persistence.spatial.SexagecimalPosition; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -62,15 +64,41 @@ public static final String PROPERTY_SUB_STRATA = "subStrata"; + public static final String PROPERTY_USE_SEXAGECIMAL_FORMAT = "useSexagecimalFormat"; + public static final String PROPERTY_GEAR_SHOOTING_START_LATITUDE = "gearShootingStartLatitude"; - + + public static final String PROPERTY_GEAR_SHOOTING_START_LATITUDE_DEGREE = "gearShootingStartLatitudeDegree"; + + public static final String PROPERTY_GEAR_SHOOTING_START_LATITUDE_MINUTE = "gearShootingStartLatitudeMinute"; + + public static final String PROPERTY_GEAR_SHOOTING_START_LATITUDE_SECOND = "gearShootingStartLatitudeSecond"; + public static final String PROPERTY_GEAR_SHOOTING_START_LONGITUDE = "gearShootingStartLongitude"; + + public static final String PROPERTY_GEAR_SHOOTING_START_LONGITUDE_DEGREE = "gearShootingStartLongitudeDegree"; + + public static final String PROPERTY_GEAR_SHOOTING_START_LONGITUDE_MINUTE = "gearShootingStartLongitudeMinute"; + + public static final String PROPERTY_GEAR_SHOOTING_START_LONGITUDE_SECOND = "gearShootingStartLongitudeSecond"; public static final String PROPERTY_GEAR_SHOOTING_START_DATE = "gearShootingStartDate"; public static final String PROPERTY_GEAR_SHOOTING_END_LATITUDE = "gearShootingEndLatitude"; + + public static final String PROPERTY_GEAR_SHOOTING_END_LATITUDE_DEGREE = "gearShootingEndLatitudeDegree"; + + public static final String PROPERTY_GEAR_SHOOTING_END_LATITUDE_MINUTE = "gearShootingEndLatitudeMinute"; + + public static final String PROPERTY_GEAR_SHOOTING_END_LATITUDE_SECOND = "gearShootingEndLatitudeSecond"; public static final String PROPERTY_GEAR_SHOOTING_END_LONGITUDE = "gearShootingEndLongitude"; + + public static final String PROPERTY_GEAR_SHOOTING_END_LONGITUDE_DEGREE = "gearShootingEndLongitudeDegree"; + + public static final String PROPERTY_GEAR_SHOOTING_END_LONGITUDE_MINUTE = "gearShootingEndLongitudeMinute"; + + public static final String PROPERTY_GEAR_SHOOTING_END_LONGITUDE_SECOND = "gearShootingEndLongitudeSecond"; public static final String PROPERTY_GEAR_SHOOTING_END_DATE = "gearShootingEndDate"; @@ -115,7 +143,7 @@ protected SexagecimalPosition gearShootingEndLongitudeAsSexagecimal; - protected boolean useSexagecimalFormat; + protected boolean useSexagecimalFormat = false; protected Float gearShootingStartLatitude; @@ -158,6 +186,10 @@ public EditFishingOperationUIModel() { super(FishingOperation.class, fromBeanBinder, toBeanBinder); + gearShootingStartLatitudeAsSexagecimal = SexagecimalPosition.valueOf(gearShootingStartLatitude); + gearShootingStartLongitudeAsSexagecimal = SexagecimalPosition.valueOf(gearShootingStartLongitude); + gearShootingEndLatitudeAsSexagecimal = SexagecimalPosition.valueOf(gearShootingEndLatitude); + gearShootingEndLongitudeAsSexagecimal = SexagecimalPosition.valueOf(gearShootingEndLongitude); } public FishingOperation getFishingOperation() { @@ -241,6 +273,16 @@ firePropertyChange(PROPERTY_SUB_STRATA, oldValue, subStrata); } + public boolean isUseSexagecimalFormat() { + return useSexagecimalFormat; + } + + public void setUseSexagecimalFormat(boolean useSexagecimalFormat) { + Object oldValue = isUseSexagecimalFormat(); + this.useSexagecimalFormat = useSexagecimalFormat; + firePropertyChange(PROPERTY_USE_SEXAGECIMAL_FORMAT, oldValue, useSexagecimalFormat); + } + public Float getGearShootingStartLatitude() { return gearShootingStartLatitude; } @@ -250,6 +292,46 @@ this.gearShootingStartLatitude = gearShootingStartLatitude; firePropertyChange(PROPERTY_GEAR_SHOOTING_START_LATITUDE, oldValue, gearShootingStartLatitude); } + + public Integer getGearShootingStartLatitudeDegree() { + Integer result = gearShootingStartLatitudeAsSexagecimal.getDegre(); + if (gearShootingStartLatitudeAsSexagecimal.isSign()) { + result *= -1; + } + return result; + } + + public void setGearShootingStartLatitudeDegree(Integer degree) { + Object oldValue = getGearShootingStartLatitudeDegree(); + boolean sign = degree != null && degree < 0; + if (degree != null) { + degree = Math.abs(degree); + } + gearShootingStartLatitudeAsSexagecimal.setSign(sign); + gearShootingStartLatitudeAsSexagecimal.setDegre(degree); + firePropertyChange(PROPERTY_GEAR_SHOOTING_START_LATITUDE_DEGREE, oldValue, degree); + } + + public Integer getGearShootingStartLatitudeMinute() { + return gearShootingStartLatitudeAsSexagecimal.getMinute(); + } + + public void setGearShootingStartLatitudeMinute(Integer minute) { + Object oldValue = getGearShootingStartLatitudeMinute(); + gearShootingStartLatitudeAsSexagecimal.setMinute(minute); + firePropertyChange(PROPERTY_GEAR_SHOOTING_START_LATITUDE_MINUTE, oldValue, minute); + + } + + public Integer getGearShootingStartLatitudeSecond() { + return gearShootingStartLatitudeAsSexagecimal.getSeconde(); + } + + public void setGearShootingStartLatitudeSecond(Integer second) { + Object oldValue = getGearShootingStartLatitudeSecond(); + gearShootingStartLatitudeAsSexagecimal.setSeconde(second); + firePropertyChange(PROPERTY_GEAR_SHOOTING_START_LATITUDE_SECOND, oldValue, second); + } public Float getGearShootingStartLongitude() { return gearShootingStartLongitude; @@ -261,6 +343,47 @@ firePropertyChange(PROPERTY_GEAR_SHOOTING_START_LONGITUDE, oldValue, gearShootingStartLongitude); } + + public Integer getGearShootingStartLongitudeDegree() { + Integer result = gearShootingStartLongitudeAsSexagecimal.getDegre(); + if (gearShootingStartLongitudeAsSexagecimal.isSign()) { + result *= -1; + } + return result; + } + + public void setGearShootingStartLongitudeDegree(Integer degree) { + Object oldValue = getGearShootingStartLongitudeDegree(); + boolean sign = degree != null && degree < 0; + if (degree != null) { + degree = Math.abs(degree); + } + gearShootingStartLongitudeAsSexagecimal.setSign(sign); + gearShootingStartLongitudeAsSexagecimal.setDegre(degree); + firePropertyChange(PROPERTY_GEAR_SHOOTING_START_LONGITUDE_DEGREE, oldValue, degree); + } + + public Integer getGearShootingStartLongitudeMinute() { + return gearShootingStartLongitudeAsSexagecimal.getMinute(); + } + + public void setGearShootingStartLongitudeMinute(Integer minute) { + Object oldValue = getGearShootingStartLongitudeMinute(); + gearShootingStartLongitudeAsSexagecimal.setMinute(minute); + firePropertyChange(PROPERTY_GEAR_SHOOTING_START_LONGITUDE_MINUTE, oldValue, minute); + + } + + public Integer getGearShootingStartLongitudeSecond() { + return gearShootingStartLongitudeAsSexagecimal.getSeconde(); + } + + public void setGearShootingStartLongitudeSecond(Integer second) { + Object oldValue = getGearShootingStartLongitudeSecond(); + gearShootingStartLongitudeAsSexagecimal.setSeconde(second); + firePropertyChange(PROPERTY_GEAR_SHOOTING_START_LONGITUDE_SECOND, oldValue, second); + } + public Date getGearShootingStartDate() { return gearShootingStartDate; } @@ -280,6 +403,46 @@ this.gearShootingEndLatitude = gearShootingEndLatitude; firePropertyChange(PROPERTY_GEAR_SHOOTING_END_LATITUDE, oldValue, gearShootingEndLatitude); } + + public Integer getGearShootingEndLatitudeDegree() { + Integer result = gearShootingEndLatitudeAsSexagecimal.getDegre(); + if (gearShootingEndLatitudeAsSexagecimal.isSign()) { + result *= -1; + } + return result; + } + + public void setGearShootingEndLatitudeDegree(Integer degree) { + Object oldValue = getGearShootingEndLatitudeDegree(); + boolean sign = degree != null && degree < 0; + if (degree != null) { + degree = Math.abs(degree); + } + gearShootingEndLatitudeAsSexagecimal.setSign(sign); + gearShootingEndLatitudeAsSexagecimal.setDegre(degree); + firePropertyChange(PROPERTY_GEAR_SHOOTING_END_LATITUDE_DEGREE, oldValue, degree); + } + + public Integer getGearShootingEndLatitudeMinute() { + return gearShootingEndLatitudeAsSexagecimal.getMinute(); + } + + public void setGearShootingEndLatitudeMinute(Integer minute) { + Object oldValue = getGearShootingEndLatitudeMinute(); + gearShootingEndLatitudeAsSexagecimal.setMinute(minute); + firePropertyChange(PROPERTY_GEAR_SHOOTING_END_LATITUDE_MINUTE, oldValue, minute); + + } + + public Integer getGearShootingEndLatitudeSecond() { + return gearShootingEndLatitudeAsSexagecimal.getSeconde(); + } + + public void setGearShootingEndLatitudeSecond(Integer second) { + Object oldValue = getGearShootingEndLatitudeSecond(); + gearShootingEndLatitudeAsSexagecimal.setSeconde(second); + firePropertyChange(PROPERTY_GEAR_SHOOTING_END_LATITUDE_SECOND, oldValue, second); + } public Float getGearShootingEndLongitude() { return gearShootingEndLongitude; @@ -291,6 +454,46 @@ firePropertyChange(PROPERTY_GEAR_SHOOTING_END_LONGITUDE, oldValue, gearShootingEndLongitude); } + public Integer getGearShootingEndLongitudeDegree() { + Integer result = gearShootingEndLongitudeAsSexagecimal.getDegre(); + if (gearShootingEndLongitudeAsSexagecimal.isSign()) { + result *= -1; + } + return result; + } + + public void setGearShootingEndLongitudeDegree(Integer degree) { + Object oldValue = getGearShootingEndLongitudeDegree(); + boolean sign = degree != null && degree < 0; + if (degree != null) { + degree = Math.abs(degree); + } + gearShootingEndLongitudeAsSexagecimal.setSign(sign); + gearShootingEndLongitudeAsSexagecimal.setDegre(degree); + firePropertyChange(PROPERTY_GEAR_SHOOTING_END_LONGITUDE_DEGREE, oldValue, degree); + } + + public Integer getGearShootingEndLongitudeMinute() { + return gearShootingEndLongitudeAsSexagecimal.getMinute(); + } + + public void setGearShootingEndLongitudeMinute(Integer minute) { + Object oldValue = getGearShootingEndLongitudeMinute(); + gearShootingEndLongitudeAsSexagecimal.setMinute(minute); + firePropertyChange(PROPERTY_GEAR_SHOOTING_END_LONGITUDE_MINUTE, oldValue, minute); + + } + + public Integer getGearShootingEndLongitudeSecond() { + return gearShootingEndLongitudeAsSexagecimal.getSeconde(); + } + + public void setGearShootingEndLongitudeSecond(Integer second) { + Object oldValue = getGearShootingEndLongitudeSecond(); + gearShootingStartLongitudeAsSexagecimal.setSeconde(second); + firePropertyChange(PROPERTY_GEAR_SHOOTING_END_LONGITUDE_SECOND, oldValue, second); + } + public Date getGearShootingEndDate() { return gearShootingEndDate; } @@ -374,4 +577,63 @@ protected FishingOperation newEntity() { return fishingOperation; } + + public void convertGearShootingCoordinatesDDToDMS() { + SexagecimalPosition position; + Integer degree; + + position = SexagecimalPosition.valueOf(gearShootingStartLatitude); + degree = position.getDegre(); + if (degree != null) { + degree *= position.isSign() ? -1 : 1; + } + setGearShootingStartLatitudeDegree(degree); + setGearShootingStartLatitudeMinute(position.getMinute()); + setGearShootingStartLatitudeSecond(position.getSeconde()); + + position = SexagecimalPosition.valueOf(gearShootingStartLongitude); + degree = position.getDegre(); + if (degree != null) { + degree *= position.isSign() ? -1 : 1; + } + setGearShootingStartLongitudeDegree(degree); + setGearShootingStartLongitudeMinute(position.getMinute()); + setGearShootingStartLongitudeSecond(position.getSeconde()); + + position = SexagecimalPosition.valueOf(gearShootingEndLatitude); + degree = position.getDegre(); + if (degree != null) { + degree *= position.isSign() ? -1 : 1; + } + if (position.getDegre() != null) { + + } + setGearShootingEndLatitudeDegree(degree); + setGearShootingEndLatitudeMinute(position.getMinute()); + setGearShootingEndLatitudeSecond(position.getSeconde()); + + position = SexagecimalPosition.valueOf(gearShootingEndLongitude); + degree = position.getDegre(); + if (degree != null) { + degree *= position.isSign() ? -1 : 1; + } + setGearShootingEndLongitudeDegree(degree); + setGearShootingEndLongitudeMinute(position.getMinute()); + setGearShootingEndLongitudeSecond(position.getSeconde()); + } + + public void convertGearShootingCoordinatesDMSToDD() { + Float decimalValue = gearShootingStartLatitudeAsSexagecimal.toDecimal(); + setGearShootingStartLatitude(decimalValue); + + decimalValue = gearShootingStartLongitudeAsSexagecimal.toDecimal(); + setGearShootingStartLongitude(decimalValue); + + decimalValue = gearShootingEndLatitudeAsSexagecimal.toDecimal(); + setGearShootingEndLatitude(decimalValue); + + decimalValue = gearShootingEndLongitudeAsSexagecimal.toDecimal(); + setGearShootingEndLongitude(decimalValue); + } + } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java 2013-01-04 09:13:06 UTC (rev 152) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java 2013-01-04 17:38:11 UTC (rev 153) @@ -53,8 +53,6 @@ public static final String PROPERTY_HYDROLOGY_PMFM_ID = "hydrologyPmfmId"; - public static final String PROPERTY_SPECIES = "species"; - public static final String PROPERTY_SAMPLE_CATEGORY_ORDER = "sampleCategoryOrder"; public static final String PROPERTY_REMOVE_SPECIES_ENABLED = "removeSpeciesEnabled"; @@ -69,8 +67,6 @@ protected List<String> hydrologyPmfmId; - protected List<SpeciesProtocol> species; - protected List<SampleCategoryEnum> sampleCategoryOrder = Lists.newArrayList( SampleCategoryEnum.sortedUnsorted, SampleCategoryEnum.size, Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-04 09:13:06 UTC (rev 152) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-04 17:38:11 UTC (rev 153) @@ -94,6 +94,8 @@ tutti.label.fishingOperation.gearDate=Date tutti.label.fishingOperation.gearLatitude=Latitude tutti.label.fishingOperation.gearLongitude=Longitude +tutti.label.fishingOperation.gearShootingCoordinatesDD=DD +tutti.label.fishingOperation.gearShootingCoordinatesDMS=DMS tutti.label.fishingOperation.gearShootingEnd=Fin de traine tutti.label.fishingOperation.gearShootingStart=Début de traine tutti.label.fishingOperation.gearTime=Heure

1 0

r152 - in trunk: . tutti-persistence tutti-persistence-dev tutti-service tutti-ui-swing
by tchemit＠users.forge.codelutin.com Jan. 4, 2013

Jan. 4, 2013

Author: tchemit Date: 2013-01-04 10:13:06 +0100 (Fri, 04 Jan 2013) New Revision: 152 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/152 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/tutti-persistence-dev/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-04 09:12:58 UTC (rev 151) +++ trunk/pom.xml 2013-01-04 09:13:06 UTC (rev 152) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>0.2.5</version> + <version>0.3-SNAPSHOT</version> <modules> <module>tutti-persistence</module> @@ -80,12 +80,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-0.2.5</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-0.2.5 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-0.2.5 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-01-04 09:12:58 UTC (rev 151) +++ trunk/tutti-persistence/pom.xml 2013-01-04 09:13:06 UTC (rev 152) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>0.2.5</version> + <version>0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence-dev/pom.xml =================================================================== --- trunk/tutti-persistence-dev/pom.xml 2013-01-04 09:12:58 UTC (rev 151) +++ trunk/tutti-persistence-dev/pom.xml 2013-01-04 09:13:06 UTC (rev 152) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>0.2.5</version> + <version>0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-01-04 09:12:58 UTC (rev 151) +++ trunk/tutti-service/pom.xml 2013-01-04 09:13:06 UTC (rev 152) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>0.2.5</version> + <version>0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-01-04 09:12:58 UTC (rev 151) +++ trunk/tutti-ui-swing/pom.xml 2013-01-04 09:13:06 UTC (rev 152) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>0.2.5</version> + <version>0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r151 - tags
by tchemit＠users.forge.codelutin.com Jan. 4, 2013

Jan. 4, 2013

Author: tchemit Date: 2013-01-04 10:12:58 +0100 (Fri, 04 Jan 2013) New Revision: 151 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/151 Log: [maven-release-plugin] copy for tag tutti-0.2.5 Added: tags/tutti-0.2.5/

1 0

r150 - in trunk: . tutti-persistence tutti-persistence-dev tutti-service tutti-ui-swing
by tchemit＠users.forge.codelutin.com Jan. 4, 2013

Jan. 4, 2013

Author: tchemit Date: 2013-01-04 10:12:50 +0100 (Fri, 04 Jan 2013) New Revision: 150 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/150 Log: [maven-release-plugin] prepare release tutti-0.2.5 Modified: trunk/pom.xml trunk/tutti-persistence-dev/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-04 08:58:06 UTC (rev 149) +++ trunk/pom.xml 2013-01-04 09:12:50 UTC (rev 150) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.2.5</version> <modules> <module>tutti-persistence</module> @@ -80,12 +80,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-0.2.5</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-0.2.5 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-0.2.5 </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-01-04 08:58:06 UTC (rev 149) +++ trunk/tutti-persistence/pom.xml 2013-01-04 09:12:50 UTC (rev 150) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.2.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence-dev/pom.xml =================================================================== --- trunk/tutti-persistence-dev/pom.xml 2013-01-04 08:58:06 UTC (rev 149) +++ trunk/tutti-persistence-dev/pom.xml 2013-01-04 09:12:50 UTC (rev 150) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.2.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-01-04 08:58:06 UTC (rev 149) +++ trunk/tutti-service/pom.xml 2013-01-04 09:12:50 UTC (rev 150) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.2.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-01-04 08:58:06 UTC (rev 149) +++ trunk/tutti-ui-swing/pom.xml 2013-01-04 09:12:50 UTC (rev 150) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.2.5</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r149 - trunk
by tchemit＠users.forge.codelutin.com Jan. 4, 2013

Jan. 4, 2013

Author: tchemit Date: 2013-01-04 09:58:06 +0100 (Fri, 04 Jan 2013) New Revision: 149 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/149 Log: use jaxx last stable version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-03 17:52:22 UTC (rev 148) +++ trunk/pom.xml 2013-01-04 08:58:06 UTC (rev 149) @@ -113,7 +113,7 @@ <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <jaxxVersion>2.5.9-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.5.9</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.7</xworkVersion>

1 0

r148 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing: . config
by tchemit＠users.forge.codelutin.com Jan. 3, 2013

Jan. 3, 2013

Author: tchemit Date: 2013-01-03 18:52:22 +0100 (Thu, 03 Jan 2013) New Revision: 148 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/148 Log: fix save of ids in user configuration Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfig.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-01-03 17:01:03 UTC (rev 147) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-01-03 17:52:22 UTC (rev 148) @@ -205,7 +205,7 @@ this.programId = programId; // always propagate the change - firePropertyChange(PROPERTY_PROGRAM_ID, null, programId); + firePropertyChange(PROPERTY_PROGRAM_ID, -1, programId); firePropertyChange(PROPERTY_CRUISE_CONTEXT_FILLED, oldValue, isCruiseContextFilled()); } @@ -216,7 +216,7 @@ this.cruiseId = cruiseId; // always propagate the change - firePropertyChange(PROPERTY_CRUISE_ID, null, cruiseId); + firePropertyChange(PROPERTY_CRUISE_ID, -1, cruiseId); firePropertyChange(PROPERTY_CRUISE_CONTEXT_FILLED, oldValue, isCruiseContextFilled()); } @@ -226,7 +226,7 @@ this.protocolId = protocolId; // always propagate the change - firePropertyChange(PROPERTY_PROTOCOL_ID, null, protocolId); + firePropertyChange(PROPERTY_PROTOCOL_ID, -1, protocolId); firePropertyChange(PROPERTY_PROTOCOL_FILLED, oldValue, isProtocolFilled()); } @@ -300,17 +300,16 @@ // test cruiseId if (cruiseId != null) { - Cruise campaign = - persistenceService.getCruise(cruiseId); + Cruise cruise = persistenceService.getCruise(cruiseId); - if (campaign != null && - !campaign.getProgram().getId().equals(programId)) { + if (cruise != null && + !cruise.getProgram().getId().equals(programId)) { // not matchin program, reset cruise id - campaign = null; + cruise = null; } - if (campaign == null) { + if (cruise == null) { // not found in this db @@ -372,7 +371,7 @@ protected void saveContextToConfig() { if (log.isInfoEnabled()) { log.info("Save config (programId: " + programId + ", cruiseId: " + - cruiseId + ", protocolId: " + protocolId + ")"); + cruiseId + ", protocolId: " + protocolId + ')'); } config.setProgramId(programId); config.setCruiseId(cruiseId); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfig.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfig.java 2013-01-03 17:01:03 UTC (rev 147) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfig.java 2013-01-03 17:52:22 UTC (rev 148) @@ -27,6 +27,7 @@ import com.google.common.base.Throwables; import fr.ifremer.tutti.service.TuttiServiceTechnicalException; import fr.ifremer.tutti.service.config.TuttiServiceConfig; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -39,7 +40,6 @@ import java.io.File; import java.io.IOException; import java.net.URL; -import java.util.Properties; /** * Tutti application config. @@ -123,15 +123,18 @@ } public String getProgramId() { - return applicationConfig.getOption(TuttiConfigOption.PROGRAM_ID.getKey()); + String result = applicationConfig.getOption(TuttiConfigOption.PROGRAM_ID.getKey()); + return StringUtils.isBlank(result) ? null : result; } public String getCruiseId() { - return applicationConfig.getOption(TuttiConfigOption.CRUISE_ID.getKey()); + String result = applicationConfig.getOption(TuttiConfigOption.CRUISE_ID.getKey()); + return StringUtils.isBlank(result) ? null : result; } public String getProtocolId() { - return applicationConfig.getOption(TuttiConfigOption.PROTOCOL_ID.getKey()); + String result = applicationConfig.getOption(TuttiConfigOption.PROTOCOL_ID.getKey()); + return StringUtils.isBlank(result) ? null : result; } public Color getColorRowInvalid() { @@ -178,33 +181,22 @@ public void setProgramId(String programId) { if (programId == null) { - - Properties options = applicationConfig.getOptions(); - options.remove(TuttiConfigOption.PROGRAM_ID.getKey()); - applicationConfig.setOptions(options); - } else { - - applicationConfig.setOption(TuttiConfigOption.PROGRAM_ID.getKey(), programId); + programId = ""; } + applicationConfig.setOption(TuttiConfigOption.PROGRAM_ID.getKey(), programId); } public void setCruiseId(String cruiseId) { if (cruiseId == null) { - Properties options = applicationConfig.getOptions(); - options.remove(TuttiConfigOption.CRUISE_ID.getKey()); - applicationConfig.setOptions(options); - } else { - applicationConfig.setOption(TuttiConfigOption.CRUISE_ID.getKey(), cruiseId); + cruiseId = ""; } + applicationConfig.setOption(TuttiConfigOption.CRUISE_ID.getKey(), cruiseId); } public void setProtocolId(String protocolId) { if (protocolId == null) { - Properties options = applicationConfig.getOptions(); - options.remove(TuttiConfigOption.PROTOCOL_ID.getKey()); - applicationConfig.setOptions(options); - } else { - applicationConfig.setOption(TuttiConfigOption.PROTOCOL_ID.getKey(), protocolId); + protocolId = ""; } + applicationConfig.setOption(TuttiConfigOption.PROTOCOL_ID.getKey(), protocolId); } }

1 0