Author: tchemit Date: 2013-02-03 14:06:27 +0100 (Sun, 03 Feb 2013) New Revision: 308 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/308 Log: reformat code + optimize imports Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiBeanUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/ChangeScreenAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedCruiseCatchesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedProtocolAction.java 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/TuttiScreen.java 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/ValidateSelectedCruiseCatchesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCatchesAction.java 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/operation/CancelEditFishingOperationAction.java 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/operation/FishingOperationsUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryType.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/CaracteristicRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/CaracteristicTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/CaracteristicTabUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/SaveProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/ActionListCellRenderer.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/CustomTab.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/SwingValidatorMessageWidget.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TabHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/CoordinateEditorType.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIModel.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-02-03 13:06:27 UTC (rev 308) @@ -28,7 +28,6 @@ import org.apache.commons.lang3.StringUtils; import org.nuiton.util.csv.ValueParserFormatter; import org.nuiton.util.csv.ext.AbstractImportExportModel; -import org.nuiton.util.csv.ext.AbstractImportModel; import java.text.ParseException; import java.util.Map; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiAction.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiAction.java 2013-02-03 13:06:27 UTC (rev 308) @@ -129,7 +129,7 @@ doAction(event); } catch (Throwable e) { if (log.isErrorEnabled()) { - log.error("Error:"+e.getMessage(),e); + log.error("Error:" + e.getMessage(), e); } if (e instanceof Exception) { ErrorDialogUI.showError((Exception) e); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiBeanUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiBeanUIModel.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiBeanUIModel.java 2013-02-03 13:06:27 UTC (rev 308) @@ -95,11 +95,11 @@ this.id = id; firePropertyChange(PROPERTY_ID, oldValue, id); } - + public String getTitle() { return null; } - + public String getIcon() { return null; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/ChangeScreenAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/ChangeScreenAction.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/ChangeScreenAction.java 2013-02-03 13:06:27 UTC (rev 308) @@ -29,18 +29,18 @@ /** * Abstract action defining actions which sets the screen of the application. - * + * * @author kmorin <kmorin@codelutin.com> * @since 1.0 */ public abstract class ChangeScreenAction extends AbstractTuttiAction<TuttiUIContext, MainUIHandler> { protected ChangeScreenAction(MainUIHandler handler, - String name, - String icon, - String text, - String tip, - boolean hideBody) { + String name, + String icon, + String text, + String tip, + boolean hideBody) { super(handler, name, icon, text, tip, hideBody); } @@ -50,10 +50,8 @@ result &= getHandler().getCurrentHandler().canCloseUI(getNextScreen()); return result; } - - /** - * @return the next screen to display. - */ + + /** @return the next screen to display. */ protected abstract TuttiScreen getNextScreen(); - + } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedCruiseCatchesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedCruiseCatchesAction.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedCruiseCatchesAction.java 2013-02-03 13:06:27 UTC (rev 308) @@ -63,5 +63,5 @@ protected TuttiScreen getNextScreen() { return TuttiScreen.EDIT_FISHING_OPERATION; } - + } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedProgramAction.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedProgramAction.java 2013-02-03 13:06:27 UTC (rev 308) @@ -68,5 +68,5 @@ protected TuttiScreen getNextScreen() { return TuttiScreen.EDIT_PROGRAM; } - + } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedProtocolAction.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedProtocolAction.java 2013-02-03 13:06:27 UTC (rev 308) @@ -69,5 +69,5 @@ protected TuttiScreen getNextScreen() { return TuttiScreen.EDIT_PROTOCOL; } - + } 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-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUI.jaxx 2013-02-03 13:06:27 UTC (rev 308) @@ -40,11 +40,15 @@ initializer='getContextValue(MainUIHandler.class)'/> <SelectCruiseAction id='selectCruiseAction' constructorParams='handler'/> - <EditSelectedProtocolAction id='editProtocolAction' constructorParams='handler'/> - <EditSelectedProgramAction id='editProgramAction' constructorParams='handler'/> + <EditSelectedProtocolAction id='editProtocolAction' + constructorParams='handler'/> + <EditSelectedProgramAction id='editProgramAction' + constructorParams='handler'/> <EditSelectedCruiseAction id='editCruiseAction' constructorParams='handler'/> - <EditSelectedCruiseCatchesAction id='editCatchesAction' constructorParams='handler'/> - <ValidateSelectedCruiseCatchesAction id='validateCatchesAction' constructorParams='handler'/> + <EditSelectedCruiseCatchesAction id='editCatchesAction' + constructorParams='handler'/> + <ValidateSelectedCruiseCatchesAction id='validateCatchesAction' + constructorParams='handler'/> <script><![CDATA[ @@ -109,7 +113,7 @@ <JToolBar id='bottomBar'> <SwingValidatorMessageWidget id='validatorMessageWidget'/> </JToolBar> - + <JXTitledPanel id='body' constraints='BorderLayout.CENTER'/> <!-- status message bar --> 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-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java 2013-02-03 13:06:27 UTC (rev 308) @@ -142,7 +142,7 @@ public SwingValidator<TuttiUIContext> getValidator() { return null; } - + //------------------------------------------------------------------------// //-- Public methods --// //------------------------------------------------------------------------// @@ -278,7 +278,7 @@ TuttiUI<?, ?> body = (TuttiUI<?, ?>) currentBody; return body.getHandler(); } - + //------------------------------------------------------------------------// //-- Internal methods --// //------------------------------------------------------------------------// @@ -291,7 +291,7 @@ if (currentBody != null) { TuttiUI<?, ?> body = (TuttiUI<?, ?>) currentBody; body.getHandler().onCloseUI(); - + context.getSwingSession().save(); ui.getBody().remove(currentBody); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiScreen.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiScreen.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiScreen.java 2013-02-03 13:06:27 UTC (rev 308) @@ -59,7 +59,7 @@ * @since 0.1 */ EDIT_PROTOCOL, - + /** * To clone a protocol. * 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-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUI.java 2013-02-03 13:06:27 UTC (rev 308) @@ -58,7 +58,7 @@ * @since 1.0 */ public static final String SIGNED_INT_2_DIGITS_PATTERN = "-?\\d{0,2}"; - + /** * Pattern to use for short numeric values in editors with max 3 digits. * @@ -117,7 +117,7 @@ * @since 0.1 */ public static final String DECIMAL3_PATTERN = "\\d{0,6}|\\d{1,6}.\\d{0,3}"; - + /** * Pattern to use for decimal numeric values with 2 digits + 3 decimal digits in * editors. Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/ValidateSelectedCruiseCatchesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/ValidateSelectedCruiseCatchesAction.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/ValidateSelectedCruiseCatchesAction.java 2013-02-03 13:06:27 UTC (rev 308) @@ -57,7 +57,7 @@ getContext().setScreen(null); getContext().setScreen(getNextScreen()); } - + @Override protected TuttiScreen getNextScreen() { return TuttiScreen.EDIT_FISHING_OPERATION; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java 2013-02-03 13:06:27 UTC (rev 308) @@ -140,14 +140,14 @@ new Color(192, 192, 192).toString(), Color.class ), - + COLOR_ROW_INVALID( "tutti.ui.color.rowInvalid", n_("tutti.option.ui.color.rowInvalid.description"), new Color(255, 128, 128).toString(), Color.class ), - + COLOR_CELL_WITH_VALUE( "tutti.ui.color.cellWithValue", n_("tutti.option.ui.color.cellWithValue.description"), @@ -168,7 +168,7 @@ CoordinateEditorType.DD.toString(), CoordinateEditorType.class ), - + DATE_FORMAT( "tutti.ui.dateFormat", n_("tutti.option.ui.dateFormat.description"), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java 2013-02-03 13:06:27 UTC (rev 308) @@ -102,7 +102,7 @@ .addOption(TuttiApplicationConfigOption.UI_CONFIG_FILE); // UI - + helper.addCategory(n_("tutti.config.category.ui"), n_("tutti.config.category.ui.description"), CALLBACK_UI) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2013-02-03 13:06:27 UTC (rev 308) @@ -75,7 +75,8 @@ initializer='getContextValue(EditCruiseUIModel.class)'/> <SaveCruiseAction id='saveCruiseAction' constructorParams='handler'/> - <CancelEditCruiseAction id='cancelEditCruiseAction' constructorParams='handler'/> + <CancelEditCruiseAction id='cancelEditCruiseAction' + constructorParams='handler'/> <SwingValidatorMessageTableModel id='errorTableModel'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-02-03 13:06:27 UTC (rev 308) @@ -35,7 +35,6 @@ import fr.ifremer.tutti.ui.swing.MainUI; import fr.ifremer.tutti.ui.swing.TuttiScreen; import fr.ifremer.tutti.ui.swing.TuttiUI; -import java.awt.event.ActionEvent; import jaxx.runtime.JAXXUtil; import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.validator.swing.SwingValidator; @@ -43,10 +42,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.JOptionPane; +import java.awt.event.ActionEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; -import javax.swing.JOptionPane; /** * Handler of UI {@link EditCruiseUI}. @@ -266,7 +266,7 @@ MainUI main = ui.getContextValue(MainUI.class, MainUI.class.getName()); main.clearValidators(); } - + @Override public boolean canCloseUI(TuttiScreen nextScreen) { boolean result = true; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java 2013-02-03 13:06:27 UTC (rev 308) @@ -37,7 +37,7 @@ /** * Saves a cruise - * + * * @author kmorin <kmorin@codelutin.com> * @since 1.0 */ @@ -58,7 +58,8 @@ /** * If the event source is a TuttiScreen, then the screen changes to the source. * Otherwise, the screen changes to the home. - * @param event + * + * @param event */ @Override protected void doAction(ActionEvent event) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCatchesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCatchesAction.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCatchesAction.java 2013-02-03 13:06:27 UTC (rev 308) @@ -30,7 +30,6 @@ import fr.ifremer.tutti.ui.swing.TuttiUIContext; import java.awt.event.ActionEvent; -import org.apache.commons.logging.LogFactory; import static org.nuiton.i18n.I18n._; 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-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2013-02-03 13:06:27 UTC (rev 308) @@ -81,7 +81,8 @@ <DeleteProtocolAction id='deleteProtocolAction' constructorParams='handler'/> <EditCatchesAction id='editCatchesAction' constructorParams='handler'/> - <ValidateCatchesAction id='validateCatchesAction' constructorParams='handler'/> + <ValidateCatchesAction id='validateCatchesAction' + constructorParams='handler'/> <BeanValidator id='validator' bean='model' errorTableModel='errorTableModel' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> @@ -102,9 +103,9 @@ <cell> <JPanel layout='{new GridLayout(1,0)}'> <JButton id='editProgramButton'/> - <!--onActionPerformed='handler.showSelectedProgram()'/>--> + <!--onActionPerformed='handler.showSelectedProgram()'/>--> <JButton id='newProgramButton'/> - <!--onActionPerformed='handler.showNewProgram()'/>--> + <!--onActionPerformed='handler.showNewProgram()'/>--> </JPanel> </cell> </row> @@ -119,9 +120,9 @@ <cell> <JPanel layout='{new GridLayout(1,0)}'> <JButton id='editCruiseButton'/> - <!--onActionPerformed='handler.showSelectedCruise()'/>--> + <!--onActionPerformed='handler.showSelectedCruise()'/>--> <JButton id='newCruiseButton'/> - <!--onActionPerformed='handler.showNewCruise()'/>--> + <!--onActionPerformed='handler.showNewCruise()'/>--> </JPanel> </cell> </row> @@ -148,9 +149,9 @@ <cell columns='3'> <JPanel layout='{new GridLayout(1,0)}'> <JButton id='editCatchesButton'/> - <!--onActionPerformed='handler.showFillCatches()'/>--> + <!--onActionPerformed='handler.showFillCatches()'/>--> <JButton id='validateCatchesButton'/> - <!--onActionPerformed='handler.showValidateCatches()'/>--> + <!--onActionPerformed='handler.showValidateCatches()'/>--> </JPanel> </cell> </row> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java 2013-02-03 13:06:27 UTC (rev 308) @@ -26,15 +26,16 @@ */ import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; -import java.awt.event.ActionEvent; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.awt.event.ActionEvent; + import static org.nuiton.i18n.I18n._; /** * Cancels the edition of a fishing operation and potentially switch to another tab. - * + * * @author kmorin <kmorin@codelutin.com> * @since 1.0 */ @@ -54,14 +55,14 @@ false ); } - + /** * If the event source is an EditFishingOperationUIHandler, - * then the tab panel of the parent switch to the index set + * then the tab panel of the parent switch to the index set * in the ID param of the event. - * + * * @param event - * @throws Exception + * @throws Exception */ @Override protected void doAction(ActionEvent event) throws Exception { @@ -76,9 +77,9 @@ } else { parentHandler.reloadFishingOperation(); } - if (event.getSource() != null - && event.getSource().getClass().isAssignableFrom(EditFishingOperationUIHandler.class)) { - + if (event.getSource() != null + && event.getSource().getClass().isAssignableFrom(EditFishingOperationUIHandler.class)) { + int newIndex = event.getID(); parentHandler.getTabPanel().setSelectedIndex(newIndex); } 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-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2013-02-03 13:06:27 UTC (rev 308) @@ -30,7 +30,7 @@ fr.ifremer.tutti.persistence.entities.referential.Gear fr.ifremer.tutti.persistence.entities.referential.Person fr.ifremer.tutti.persistence.entities.referential.Vessel - + fr.ifremer.tutti.ui.swing.content.operation.fishing.environment.EnvironmentTabUI fr.ifremer.tutti.ui.swing.content.operation.fishing.gearshooting.GearShootingTabUI fr.ifremer.tutti.ui.swing.content.operation.fishing.hydrology.HydrologyTabUI @@ -77,11 +77,13 @@ <EditFishingOperationUIModel id='model' initializer='getContextValue(EditFishingOperationUIModel.class)'/> - - <SaveFishingOperationAction id='saveFishingOperationAction' constructorParams='handler'/> - - <CancelEditFishingOperationAction id='cancelFishingOperationAction' constructorParams='handler'/> + <SaveFishingOperationAction id='saveFishingOperationAction' + constructorParams='handler'/> + + <CancelEditFishingOperationAction id='cancelFishingOperationAction' + constructorParams='handler'/> + <SwingValidatorMessageTableModel id='errorTableModel'/> <BeanValidator id='validator' context='validate' bean='model' @@ -161,347 +163,351 @@ <JTabbedPane id='fishingOperationTabPane' constraints='BorderLayout.CENTER'> <tab id='traitGeneralTab'> -<!-- <JScrollPane id='fishingOperationTabScrollPane'>--> - <Table fill='both' id='generalForm'> + <!-- <JScrollPane id='fishingOperationTabScrollPane'>--> + <Table fill='both' id='generalForm'> - <!-- Numero station / Numéro trait / Numéro de poche --> - <row> - <cell> - <JLabel id='stationNumberLabel'/> - </cell> - <cell weightx='0.3'> - <JTextField id='stationNumberField' - onKeyReleased='handler.setText(event, "stationNumber")'/> - </cell> - <cell> - <JLabel id='fishingOperationNumberLabel'/> - </cell> - <cell weightx='0.3'> - <NumberEditor id='fishingOperationNumberField' - constructorParams='this'/> - </cell> - <cell> - <JLabel id='multirigAggregationLabel'/> - </cell> - <cell weightx='0.3'> - <JTextField id='multirigAggregationField' - onKeyReleased='handler.setText(event, "multirigAggregation")'/> - </cell> - </row> + <!-- Numero station / Numéro trait / Numéro de poche --> + <row> + <cell> + <JLabel id='stationNumberLabel'/> + </cell> + <cell weightx='0.3'> + <JTextField id='stationNumberField' + onKeyReleased='handler.setText(event, "stationNumber")'/> + </cell> + <cell> + <JLabel id='fishingOperationNumberLabel'/> + </cell> + <cell weightx='0.3'> + <NumberEditor id='fishingOperationNumberField' + constructorParams='this'/> + </cell> + <cell> + <JLabel id='multirigAggregationLabel'/> + </cell> + <cell weightx='0.3'> + <JTextField id='multirigAggregationField' + onKeyReleased='handler.setText(event, "multirigAggregation")'/> + </cell> + </row> - <!-- Strate d'association / Sous Strate / Localité --> - <row> - <cell> - <JLabel id='strataLabel'/> - </cell> - <cell weightx='0.3'> - <BeanComboBox id='strataComboBox' constructorParams='this' - genericType='FishingOperationLocation'/> - </cell> - <cell> - <JLabel id='subStrataLabel'/> - </cell> - <cell weightx='0.3'> - <BeanComboBox id='subStrataComboBox' constructorParams='this' - genericType='FishingOperationLocation'/> - </cell> - <cell> - <JLabel id='locationLabel'/> - </cell> - <cell weightx='0.3'> - <BeanComboBox id='locationComboBox' constructorParams='this' - genericType='FishingOperationLocation'/> - </cell> - </row> + <!-- Strate d'association / Sous Strate / Localité --> + <row> + <cell> + <JLabel id='strataLabel'/> + </cell> + <cell weightx='0.3'> + <BeanComboBox id='strataComboBox' constructorParams='this' + genericType='FishingOperationLocation'/> + </cell> + <cell> + <JLabel id='subStrataLabel'/> + </cell> + <cell weightx='0.3'> + <BeanComboBox id='subStrataComboBox' constructorParams='this' + genericType='FishingOperationLocation'/> + </cell> + <cell> + <JLabel id='locationLabel'/> + </cell> + <cell weightx='0.3'> + <BeanComboBox id='locationComboBox' constructorParams='this' + genericType='FishingOperationLocation'/> + </cell> + </row> - <!-- début de traine long-lat-date-heure - fin de traine long-lat-date-heure --> - <row> - <cell columns='6'> - <JPanel layout="{new BorderLayout()}"> - <Table id="gearCaracteristicsTable" fill="both" weightx='1' - constraints='BorderLayout.CENTER'> - <row> - <cell> - <JPanel/> - </cell> - <cell> - <JLabel id='gearLatitudeLabel'/> - </cell> - <cell> - <JLabel id='gearLongitudeLabel'/> - </cell> - <cell> - <JLabel id='gearDateLabel'/> - </cell> - <cell> - <JLabel id='gearTimeLabel'/> - </cell> - </row> + <!-- début de traine long-lat-date-heure + fin de traine long-lat-date-heure --> + <row> + <cell columns='6'> + <JPanel layout="{new BorderLayout()}"> + <Table id="gearCaracteristicsTable" fill="both" weightx='1' + constraints='BorderLayout.CENTER'> + <row> + <cell> + <JPanel/> + </cell> + <cell> + <JLabel id='gearLatitudeLabel'/> + </cell> + <cell> + <JLabel id='gearLongitudeLabel'/> + </cell> + <cell> + <JLabel id='gearDateLabel'/> + </cell> + <cell> + <JLabel id='gearTimeLabel'/> + </cell> + </row> - <row> - <cell> - <JLabel id='gearShootingStartLabel'/> - </cell> - <cell weightx='1'> - <JPanel id='gearShootingStartLatitudePanel'> - <NumberEditor id='gearShootingStartLatitudeDDField' - constraints='"DD"' - constructorParams='this'/> - <JPanel layout="{new GridLayout(1,0)}" - constraints='"DMS"'> - <NumberEditor - id='gearShootingStartLatitudeDMSDegreeField' - constructorParams='this' styleClass='degree'/> + <row> + <cell> + <JLabel id='gearShootingStartLabel'/> + </cell> + <cell weightx='1'> + <JPanel id='gearShootingStartLatitudePanel'> + <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='gearShootingStartLatitudeDMSMinuteField' + constructorParams='this' styleClass='minute'/> - <NumberEditor - id='gearShootingStartLatitudeDMSSecondField' - constructorParams='this' styleClass='second'/> - </JPanel> - <JPanel layout="{new GridLayout(1,0)}" - constraints='"DMD"'> - <NumberEditor - id='gearShootingStartLatitudeDMDDegreeField' - constructorParams='this' styleClass='degree'/> + <NumberEditor + id='gearShootingStartLatitudeDMSSecondField' + constructorParams='this' styleClass='second'/> + </JPanel> + <JPanel layout="{new GridLayout(1,0)}" + constraints='"DMD"'> + <NumberEditor + id='gearShootingStartLatitudeDMDDegreeField' + constructorParams='this' styleClass='degree'/> - <NumberEditor - id='gearShootingStartLatitudeDMDMinuteField' - constructorParams='this' styleClass='decimalMinute'/> - </JPanel> + <NumberEditor + id='gearShootingStartLatitudeDMDMinuteField' + constructorParams='this' + styleClass='decimalMinute'/> </JPanel> - </cell> - <cell weightx='1'> - <JPanel id='gearShootingStartLongitudePanel'> - <NumberEditor id='gearShootingStartLongitudeDDField' - constraints='"DD"' - constructorParams='this'/> - <JPanel layout="{new GridLayout(1,0)}" - constraints='"DMS"'> - <NumberEditor - id='gearShootingStartLongitudeDMSDegreeField' - constructorParams='this' styleClass='degree'/> + </JPanel> + </cell> + <cell weightx='1'> + <JPanel id='gearShootingStartLongitudePanel'> + <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='gearShootingStartLongitudeDMSMinuteField' + constructorParams='this' styleClass='minute'/> - <NumberEditor - id='gearShootingStartLongitudeDMSSecondField' - constructorParams='this' styleClass='second'/> - </JPanel> - <JPanel layout="{new GridLayout(1,0)}" - constraints='"DMD"'> - <NumberEditor - id='gearShootingStartLongitudeDMDDegreeField' - constructorParams='this' styleClass='degree'/> + <NumberEditor + id='gearShootingStartLongitudeDMSSecondField' + constructorParams='this' styleClass='second'/> + </JPanel> + <JPanel layout="{new GridLayout(1,0)}" + constraints='"DMD"'> + <NumberEditor + id='gearShootingStartLongitudeDMDDegreeField' + constructorParams='this' styleClass='degree'/> - <NumberEditor - id='gearShootingStartLongitudeDMDMinuteField' - constructorParams='this' styleClass='decimalMinute'/> - </JPanel> + <NumberEditor + id='gearShootingStartLongitudeDMDMinuteField' + constructorParams='this' + styleClass='decimalMinute'/> </JPanel> - </cell> - <cell> - <JXDatePicker id='gearShootingStartDateField' - onActionPerformed='handler.setDate(event, "gearShootingStartDate")'/> - </cell> - <cell> - <SimpleTimeEditor id='gearShootingStartTimeField' - constructorParams='this'/> - </cell> - </row> - <row> - <cell> - <JLabel id='gearShootingEndLabel'/> - </cell> - <cell weightx='1'> - <JPanel id='gearShootingEndLatitudePanel'> - <NumberEditor id='gearShootingEndLatitudeDDField' - constraints='"DD"' + </JPanel> + </cell> + <cell> + <JXDatePicker id='gearShootingStartDateField' + onActionPerformed='handler.setDate(event, "gearShootingStartDate")'/> + </cell> + <cell> + <SimpleTimeEditor id='gearShootingStartTimeField' constructorParams='this'/> - <JPanel layout="{new GridLayout(1,0)}" - constraints='"DMS"'> - <NumberEditor - id='gearShootingEndLatitudeDMSDegreeField' - constructorParams='this' styleClass='degree'/> + </cell> + </row> + <row> + <cell> + <JLabel id='gearShootingEndLabel'/> + </cell> + <cell weightx='1'> + <JPanel id='gearShootingEndLatitudePanel'> + <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='gearShootingEndLatitudeDMSMinuteField' + constructorParams='this' styleClass='minute'/> - <NumberEditor - id='gearShootingEndLatitudeDMSSecondField' - constructorParams='this' styleClass='second'/> - </JPanel> - <JPanel layout="{new GridLayout(1,0)}" - constraints='"DMD"'> - <NumberEditor - id='gearShootingEndLatitudeDMDDegreeField' - constructorParams='this' styleClass='degree'/> + <NumberEditor + id='gearShootingEndLatitudeDMSSecondField' + constructorParams='this' styleClass='second'/> + </JPanel> + <JPanel layout="{new GridLayout(1,0)}" + constraints='"DMD"'> + <NumberEditor + id='gearShootingEndLatitudeDMDDegreeField' + constructorParams='this' styleClass='degree'/> - <NumberEditor - id='gearShootingEndLatitudeDMDMinuteField' - constructorParams='this' styleClass='decimalMinute'/> - </JPanel> + <NumberEditor + id='gearShootingEndLatitudeDMDMinuteField' + constructorParams='this' + styleClass='decimalMinute'/> </JPanel> - </cell> - <cell weightx='1'> - <JPanel id='gearShootingEndLongitudePanel'> - <NumberEditor id='gearShootingEndLongitudeDDField' - constraints='"DD"' - constructorParams='this'/> - <JPanel layout="{new GridLayout(1,0)}" - constraints='"DMS"'> - <NumberEditor - id='gearShootingEndLongitudeDMSDegreeField' - constructorParams='this' styleClass='degree'/> + </JPanel> + </cell> + <cell weightx='1'> + <JPanel id='gearShootingEndLongitudePanel'> + <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='gearShootingEndLongitudeDMSMinuteField' + constructorParams='this' styleClass='minute'/> - <NumberEditor - id='gearShootingEndLongitudeDMSSecondField' - constructorParams='this' styleClass='second'/> - </JPanel> - <JPanel layout="{new GridLayout(1,0)}" - constraints='"DMD"'> - <NumberEditor - id='gearShootingEndLongitudeDMDDegreeField' - constructorParams='this' styleClass='degree'/> + <NumberEditor + id='gearShootingEndLongitudeDMSSecondField' + constructorParams='this' styleClass='second'/> + </JPanel> + <JPanel layout="{new GridLayout(1,0)}" + constraints='"DMD"'> + <NumberEditor + id='gearShootingEndLongitudeDMDDegreeField' + constructorParams='this' styleClass='degree'/> - <NumberEditor - id='gearShootingEndLongitudeDMDMinuteField' - constructorParams='this' styleClass='decimalMinute'/> - </JPanel> + <NumberEditor + id='gearShootingEndLongitudeDMDMinuteField' + constructorParams='this' + styleClass='decimalMinute'/> </JPanel> - </cell> - <cell> - <JXDatePicker id='gearShootingEndDateField' - onActionPerformed='handler.setDate(event, "gearShootingEndDate")'/> - </cell> - <cell> - <SimpleTimeEditor id='gearShootingEndTimeField' - constructorParams='this'/> - </cell> - </row> - - <!-- FishingOperation rectiligne / distance chalutee / durée --> - <row> - <cell> - <JLabel/> - </cell> - <cell> - <JCheckBox id='fishingOperationRectiligneCheckBox' - onItemStateChanged='handler.setBoolean(event, "fishingOperationRectiligne")'/> - </cell> - <cell> - <JPanel layout="{new BorderLayout()}"> - <JLabel id='trawlDistanceLabel' - constraints='BorderLayout.WEST'/> - <NumberEditor id='trawlDistanceField' - constraints='BorderLayout.CENTER' + </JPanel> + </cell> + <cell> + <JXDatePicker id='gearShootingEndDateField' + onActionPerformed='handler.setDate(event, "gearShootingEndDate")'/> + </cell> + <cell> + <SimpleTimeEditor id='gearShootingEndTimeField' constructorParams='this'/> - </JPanel> - </cell> - <cell> - <JLabel/> - </cell> - <cell> - <JPanel layout="{new BorderLayout()}"> - <JLabel id='durationLabel' - constraints='BorderLayout.WEST'/> - <JTextField id='durationField' - constraints='BorderLayout.CENTER'/> - </JPanel> - </cell> - </row> + </cell> + </row> - <!-- Fishing operation valid / invalid--> - <row> - <cell> - <JToolBar id='fishingOperationValidPanel' - layout='{new BorderLayout()}'> - <JButton id='resetValidStateButton' - constraints='BorderLayout.WEST' - onActionPerformed="model.setFishingOperationValid(null)"/> - <JRadioButton id='fishingOperationResetRadio' - constraints='BorderLayout.EAST'/> - </JToolBar> - </cell> - <cell> - <HBox> - <JRadioButton id='fishingOperationValidRadio' - onActionPerformed='model.setFishingOperationValid(Boolean.TRUE)'/> - <JRadioButton id='fishingOperationInvalidRadio' - onActionPerformed='model.setFishingOperationValid(Boolean.FALSE)'/> - </HBox> - </cell> - <cell columns="4"> - <JPanel/> - </cell> - </row> - </Table> - </JPanel> - </cell> - </row> + <!-- FishingOperation rectiligne / distance chalutee / durée --> + <row> + <cell> + <JLabel/> + </cell> + <cell> + <JCheckBox id='fishingOperationRectiligneCheckBox' + onItemStateChanged='handler.setBoolean(event, "fishingOperationRectiligne")'/> + </cell> + <cell> + <JPanel layout="{new BorderLayout()}"> + <JLabel id='trawlDistanceLabel' + constraints='BorderLayout.WEST'/> + <NumberEditor id='trawlDistanceField' + constraints='BorderLayout.CENTER' + constructorParams='this'/> + </JPanel> + </cell> + <cell> + <JLabel/> + </cell> + <cell> + <JPanel layout="{new BorderLayout()}"> + <JLabel id='durationLabel' + constraints='BorderLayout.WEST'/> + <JTextField id='durationField' + constraints='BorderLayout.CENTER'/> + </JPanel> + </cell> + </row> - <!-- Actions d'import --> - <row> - <cell columns='6'> - <JPanel layout='{new GridLayout(1,0)}'> - <JButton id='importCasinoButton' - onActionPerformed='handler.importCasino()'/> - </JPanel> - </cell> - </row> + <!-- Fishing operation valid / invalid--> + <row> + <cell> + <JToolBar id='fishingOperationValidPanel' + layout='{new BorderLayout()}'> + <JButton id='resetValidStateButton' + constraints='BorderLayout.WEST' + onActionPerformed="model.setFishingOperationValid(null)"/> + <JRadioButton id='fishingOperationResetRadio' + constraints='BorderLayout.EAST'/> + </JToolBar> + </cell> + <cell> + <HBox> + <JRadioButton id='fishingOperationValidRadio' + onActionPerformed='model.setFishingOperationValid(Boolean.TRUE)'/> + <JRadioButton id='fishingOperationInvalidRadio' + onActionPerformed='model.setFishingOperationValid(Boolean.FALSE)'/> + </HBox> + </cell> + <cell columns="4"> + <JPanel/> + </cell> + </row> + </Table> + </JPanel> + </cell> + </row> - <!-- Saisisseur --> - <row weighty='0.2'> - <cell columns='6'> - <JPanel layout='{new GridLayout(1,0)}'> - <BeanDoubleList id='saisisseurList' genericType='Person'/> - <Table fill="both" weightx='1' id='traitVesselPanel'> - <row> - <cell anchor='west'> - <JLabel id='vesselLabel'/> - </cell> - <cell weightx="1.0" fill="both"> - <BeanComboBox id='vesselComboBox' - constructorParams='this' - genericType='Vessel'/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel id='gearLabel'/> - </cell> - <cell> - <BeanComboBox id='gearComboBox' - constructorParams='this' - genericType='Gear'/> - </cell> - </row> - </Table> - </JPanel> - </cell> - </row> + <!-- Actions d'import --> + <row> + <cell columns='6'> + <JPanel layout='{new GridLayout(1,0)}'> + <JButton id='importCasinoButton' + onActionPerformed='handler.importCasino()'/> + </JPanel> + </cell> + </row> - <!-- Commentaire --> - <row weighty='0.8'> - <cell columns='6'> - <JScrollPane id='commentPane' - onFocusGained='commentField.requestFocus()'> - <JTextArea id='commentField' - onKeyReleased='handler.setText(event, "comment")'/> - </JScrollPane> - </cell> - </row> - </Table> + <!-- Saisisseur --> + <row weighty='0.2'> + <cell columns='6'> + <JPanel layout='{new GridLayout(1,0)}'> + <BeanDoubleList id='saisisseurList' genericType='Person'/> + <Table fill="both" weightx='1' id='traitVesselPanel'> + <row> + <cell anchor='west'> + <JLabel id='vesselLabel'/> + </cell> + <cell weightx="1.0" fill="both"> + <BeanComboBox id='vesselComboBox' + constructorParams='this' + genericType='Vessel'/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel id='gearLabel'/> + </cell> + <cell> + <BeanComboBox id='gearComboBox' + constructorParams='this' + genericType='Gear'/> + </cell> + </row> + </Table> + </JPanel> + </cell> + </row> + + <!-- Commentaire --> + <row weighty='0.8'> + <cell columns='6'> + <JScrollPane id='commentPane' + onFocusGained='commentField.requestFocus()'> + <JTextArea id='commentField' + onKeyReleased='handler.setText(event, "comment")'/> + </JScrollPane> + </cell> + </row> + </Table> <!--</JScrollPane>--> </tab> 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-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-02-03 13:06:27 UTC (rev 308) @@ -53,6 +53,7 @@ import fr.ifremer.tutti.ui.swing.util.TabHandler; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -68,7 +69,6 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; -import jaxx.runtime.validator.swing.SwingValidator; /** * Handler for UI {@link EditFishingOperationUI}. @@ -166,7 +166,7 @@ onSelectedSubStrata(source, newStrata); } }); - + model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_FISHING_OPERATION_RECTILIGNE, new PropertyChangeListener() { @Override @@ -178,9 +178,9 @@ Float longS = source.getGearShootingStartLongitude(); Float latE = source.getGearShootingEndLatitude(); Float longE = source.getGearShootingEndLongitude(); - - if (latS != null && longS != null - && latE != null && longE != null) { + + if (latS != null && longS != null + && latE != null && longE != null) { LatLng start = new LatLng(latS, longS); LatLng end = new LatLng(latE, longE); Double distance = LatLngTool.distance(start, end, LengthUnit.KILOMETER); @@ -189,7 +189,7 @@ } } }); - + model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_FISHING_OPERATION_VALID, new PropertyChangeListener() { @Override @@ -199,7 +199,7 @@ Color fontColor = Color.BLACK; if (valid == Boolean.TRUE) { color = Color.GREEN; - + } else if (valid == Boolean.FALSE) { color = Color.RED; fontColor = Color.WHITE; @@ -249,7 +249,7 @@ Preconditions.checkNotNull(cruise, "Could not find cruise in ui context"); ui.getMultirigAggregationField().setEnabled(cruise.getMultirigNumber() != 1); - + Program program = TuttiUIUtil.getProgram(ui); Preconditions.checkNotNull(program, "Could not find program in ui context"); @@ -288,7 +288,7 @@ setCustomTab(0, model); listModelIsModify(model); - + //init gear shooting GearShootingTabUIModel gearShootingModel = ui.getGearShootingTabContent().getModel(); @@ -406,7 +406,7 @@ public SwingValidator<EditFishingOperationUIModel> getValidator() { return ui.getValidator(); } - + //------------------------------------------------------------------------// //-- Public methods --// //------------------------------------------------------------------------// @@ -477,7 +477,7 @@ // update saisissuer selection List<Person> saisisseur = model.getSaisisseur(); ui.getSaisisseurList().getModel().setSelected(saisisseur); - + // update model empty property model.setEmpty(empty); 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-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-02-03 13:06:27 UTC (rev 308) @@ -55,7 +55,7 @@ private static final long serialVersionUID = 1L; public static final String TITLE = n_("tutti.label.tab.fishingOperation.general"); - + public static final String PROPERTY_PERSISTED = "persisted"; public static final String PROPERTY_EMPTY = "empty"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-02-03 13:06:27 UTC (rev 308) @@ -36,6 +36,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.decorator.Decorator; @@ -44,7 +45,6 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; -import jaxx.runtime.validator.swing.SwingValidator; import static org.nuiton.i18n.I18n._; @@ -187,7 +187,7 @@ } return result; } - + @Override public SwingValidator<FishingOperationsUIModel> getValidator() { return null; @@ -221,7 +221,7 @@ if (gears.size() == 1) { newFishingOperation.setGear(gears.get(0)); } - + if (cruise.getMultirigNumber() == 1) { newFishingOperation.setMultirigAggregation("1"); } @@ -241,7 +241,7 @@ if (log.isInfoEnabled()) { log.info("New selected fishingOperation: " + fishingOperation); } - + // back to general tab of fishingOperation tabs ui.getFishingOperationTabContent().getFishingOperationTabPane().setSelectedIndex(0); @@ -303,7 +303,7 @@ model.updateFishingOperation(existingFishingOperation, savedFishingOperation); } } - + public void reloadFishingOperation() { FishingOperation operation = getModel().getSelectedFishingOperation(); selectFishingOperation(operation); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java 2013-02-03 13:06:27 UTC (rev 308) @@ -44,7 +44,7 @@ /** * Saves a fishing operation and potentially sets another screen or switch to another tab. - * + * * @author kmorin <kmorin@codelutin.com> * @since 1.0 */ @@ -64,15 +64,15 @@ false ); } - + /** * If the event source is an EditFishingOperationUIHandler, - * then the tab panel of the parent switch to the index set + * then the tab panel of the parent switch to the index set * in the ID param of the event. * If the event source is a TuttiScreen, then the screen changes to the source. - * + * * @param event - * @throws Exception + * @throws Exception */ @Override protected void doAction(ActionEvent event) { @@ -98,18 +98,18 @@ // save modified fishing operation FishingOperation toSave = beanToSave.toBean(); - + CaracteristicTabUIModel[] subModels = handler.getSubModels(); for (CaracteristicTabUIModel subModel : subModels) { Class<?> modelClass = subModel.getClass(); CaracteristicMap caracteristics = subModel.getCaracteristicMap(); - + if (modelClass.isAssignableFrom(EnvironmentTabUIModel.class)) { toSave.setEnvironmentCaracteristics(caracteristics); - + } else if (modelClass.isAssignableFrom(GearShootingTabUIModel.class)) { toSave.setGearShootingCaracteristics(caracteristics); - + } else if (modelClass.isAssignableFrom(HydrologyTabUIModel.class)) { toSave.setHydrologyCaracteristics(caracteristics); } @@ -131,13 +131,13 @@ // persist current fishingOperation parentHandler.saveFishingOperation(toSave); } - + if (event.getSource() != null) { - Class sourceClass = event.getSource().getClass(); + Class<?> sourceClass = event.getSource().getClass(); if (sourceClass.isAssignableFrom(EditFishingOperationUIHandler.class)) { int newIndex = event.getID(); parentHandler.getTabPanel().setSelectedIndex(newIndex); - + } else if (sourceClass.isAssignableFrom(TuttiScreen.class)) { TuttiScreen nextScreen = (TuttiScreen) event.getSource(); getContext().setScreen(nextScreen); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-02-03 13:06:27 UTC (rev 308) @@ -37,10 +37,10 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI org.jdesktop.swingx.JXTitledPanel - + jaxx.runtime.swing.CardLayout2Ext jaxx.runtime.swing.editor.NumberEditor - + jaxx.runtime.validator.swing.SwingValidatorUtil jaxx.runtime.validator.swing.SwingValidatorMessageTableModel @@ -140,7 +140,7 @@ constructorParams='this'/> </cell> </row> - <!--Poids total hors vrac--> + <!--Poids total hors vrac--> <row> <cell> <JLabel id='catchTotalUnsortedWeightLabel'/> @@ -296,17 +296,24 @@ </tab> <tab id='speciesTab' title='tutti.label.tab.species'> <JPanel id='speciesTabPanel'> - <JXTitledPanel id='speciesTabFishingOperationReminderLabel' constraints='EditCatchesUIHandler.MAIN_CARD'> + <JXTitledPanel id='speciesTabFishingOperationReminderLabel' + constraints='EditCatchesUIHandler.MAIN_CARD'> <SpeciesBatchUI id='speciesTabContent' constructorParams='this'/> </JXTitledPanel> - <JXTitledPanel id='speciesTabCreateBatchReminderLabel' constraints='EditCatchesUIHandler.CREATE_BATCH_CARD'> - <CreateSpeciesBatchUI id='speciesTabCreateBatch' constructorParams='this'/> + <JXTitledPanel id='speciesTabCreateBatchReminderLabel' + constraints='EditCatchesUIHandler.CREATE_BATCH_CARD'> + <CreateSpeciesBatchUI id='speciesTabCreateBatch' + constructorParams='this'/> </JXTitledPanel> - <JXTitledPanel id='speciesTabSplitBatchReminderLabel' constraints='EditCatchesUIHandler.SPLIT_BATCH_CARD'> - <SplitSpeciesBatchUI id='speciesTabSplitBatch' constructorParams='this'/> + <JXTitledPanel id='speciesTabSplitBatchReminderLabel' + constraints='EditCatchesUIHandler.SPLIT_BATCH_CARD'> + <SplitSpeciesBatchUI id='speciesTabSplitBatch' + constructorParams='this'/> </JXTitledPanel> - <JXTitledPanel id='speciesTabFrequencyEditorLabel' constraints='EditCatchesUIHandler.EDIT_FREQUENCY_CARD'> - <SpeciesFrequencyUI id='speciesTabFrequencyEditor' constructorParams='speciesTabContent'/> + <JXTitledPanel id='speciesTabFrequencyEditorLabel' + constraints='EditCatchesUIHandler.EDIT_FREQUENCY_CARD'> + <SpeciesFrequencyUI id='speciesTabFrequencyEditor' + constructorParams='speciesTabContent'/> </JXTitledPanel> </JPanel> </tab> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-02-03 13:06:27 UTC (rev 308) @@ -34,31 +34,32 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; import fr.ifremer.tutti.ui.swing.util.TabHandler; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; -import java.awt.Component; -import java.awt.Container; -import java.awt.LayoutManager; -import javax.swing.JPanel; -import javax.swing.JTabbedPane; import jaxx.runtime.swing.CardLayout2Ext; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.JPanel; +import javax.swing.JTabbedPane; +import java.awt.Component; +import java.awt.Container; +import java.awt.LayoutManager; + /** * @author tchemit <chemit@codelutin.com> * @since 0.3 */ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<EditCatchesUIModel> - implements TabHandler { + implements TabHandler { public static final String MAIN_CARD = "main"; - + public static final String CREATE_BATCH_CARD = "createBatch"; - + public static final String SPLIT_BATCH_CARD = "splitBatch"; - + public static final String EDIT_FREQUENCY_CARD = "editFrequency"; - + /** Logger. */ private static final Log log = LogFactory.getLog(EditCatchesUIHandler.class); @@ -150,7 +151,7 @@ public SwingValidator<EditCatchesUIModel> getValidator() { return ui.getValidator(); } - + @Override protected JTabbedPane getTabPanel() { return ui.getTabPane(); @@ -201,7 +202,7 @@ CatchBatch batch; if (empty) { - batch= new CatchBatch(); + batch = new CatchBatch(); model.setCatchBatch(null); model.setFishingOperation(null); } else { @@ -267,11 +268,11 @@ main.registerValidator(getValidator()); main.registerValidator(ui.getSpeciesTabContent().getHandler().getValidator()); } - + public void importPupitri() { //TODO } - + public void setSelectedCard(String card) { Component selectedComponent = getTabPanel().getSelectedComponent(); if (selectedComponent.getClass().isAssignableFrom(JPanel.class)) { @@ -280,16 +281,16 @@ if (layoutManager.getClass().isAssignableFrom(CardLayout2Ext.class)) { CardLayout2Ext layout = (CardLayout2Ext) layoutManager; layout.setSelected(card); - + if (MAIN_CARD.equals(card)) { registerValidators(); - + } else { - Container cardContainer = (Container)layout.getComponent(panel, card); + Container cardContainer = (Container) layout.getComponent(panel, card); TuttiUI tuttiUi = null; if (TuttiUI.class.isInstance(cardContainer)) { tuttiUi = (TuttiUI) cardContainer; - + } else { for (Component comp : cardContainer.getComponents()) { if (TuttiUI.class.isInstance(comp)) { @@ -305,7 +306,7 @@ } } } - + } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2013-02-03 13:06:27 UTC (rev 308) @@ -57,9 +57,9 @@ public static final String PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_WEIGHT = "speciesTotalSampleSortedWeight"; public static final String PROPERTY_SPECIES_TOTAL_UNSORTED_WEIGHT = "speciesTotalUnsortedWeight"; - + public static final String PROPERTY_SPECIES_TOTAL_INERT_WEIGHT = "speciesTotalInertWeight"; - + public static final String PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT = "speciesTotalLivingNotItemizedWeight"; public static final String PROPERTY_BENTHOS_TOTAL_WEIGHT = "benthosTotalWeight"; @@ -272,7 +272,7 @@ this.speciesTotalUnsortedWeight = speciesTotalUnsortedWeight; firePropertyChange(PROPERTY_SPECIES_TOTAL_UNSORTED_WEIGHT, oldValue, speciesTotalUnsortedWeight); } - + public Float getSpeciesTotalInertWeight() { return speciesTotalInertWeight; } @@ -282,7 +282,7 @@ this.speciesTotalInertWeight = speciesTotalInertWeight; firePropertyChange(PROPERTY_SPECIES_TOTAL_INERT_WEIGHT, oldValue, speciesTotalInertWeight); } - + public Float getSpeciesTotalLivingNotItemizedWeight() { return speciesTotalLivingNotItemizedWeight; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java 2013-02-03 13:06:27 UTC (rev 308) @@ -67,7 +67,7 @@ public AccidentalBatchTableModel(TableColumnModel columnModel) { - super(columnModel,true, true); + super(columnModel, true, true); setNoneEditableCols(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-02-03 13:06:27 UTC (rev 308) @@ -37,6 +37,7 @@ import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.editor.AttachmentCellComponent; import fr.ifremer.tutti.ui.swing.util.editor.LongTextCellComponent; +import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; @@ -44,7 +45,6 @@ import org.nuiton.util.decorator.Decorator; import java.util.List; -import jaxx.runtime.validator.swing.SwingValidator; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-02-03 13:06:27 UTC (rev 308) @@ -37,6 +37,7 @@ import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.editor.AttachmentCellComponent; import fr.ifremer.tutti.ui.swing.util.editor.LongTextCellComponent; +import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; @@ -44,7 +45,6 @@ import org.nuiton.util.decorator.Decorator; import java.util.List; -import jaxx.runtime.validator.swing.SwingValidator; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchUIHandler.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchUIHandler.java 2013-02-03 13:06:27 UTC (rev 308) @@ -36,6 +36,7 @@ import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.editor.AttachmentCellComponent; import fr.ifremer.tutti.ui.swing.util.editor.LongTextCellComponent; +import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; @@ -43,7 +44,6 @@ import org.nuiton.util.decorator.Decorator; import java.util.List; -import jaxx.runtime.validator.swing.SwingValidator; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java 2013-02-03 13:06:27 UTC (rev 308) @@ -37,6 +37,7 @@ import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.editor.AttachmentCellComponent; import fr.ifremer.tutti.ui.swing.util.editor.LongTextCellComponent; +import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; @@ -44,7 +45,6 @@ import org.nuiton.util.decorator.Decorator; import java.util.List; -import jaxx.runtime.validator.swing.SwingValidator; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryType.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryType.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryType.java 2013-02-03 13:06:27 UTC (rev 308) @@ -27,7 +27,9 @@ import com.google.common.collect.Maps; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; import fr.ifremer.tutti.service.DecoratorService; + import java.util.EnumMap; + import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; @@ -81,7 +83,7 @@ public String toString() { return getLabel(); } - + public static final EnumMap<SampleCategoryEnum, SampleCategoryType> enumToType; static { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2013-02-03 13:06:27 UTC (rev 308) @@ -65,9 +65,12 @@ <SwingValidatorMessageTableModel id='errorTableModel'/> - <RenameSpeciesBatchAction id='renameSpeciesBatchAction' constructorParams='handler'/> - <RemoveSpeciesBatchAction id='removeSpeciesBatchAction' constructorParams='handler'/> - <RemoveSpeciesSubBatchAction id='removeSpeciesSubBatchAction' constructorParams='handler'/> + <RenameSpeciesBatchAction id='renameSpeciesBatchAction' + constructorParams='handler'/> + <RemoveSpeciesBatchAction id='removeSpeciesBatchAction' + constructorParams='handler'/> + <RemoveSpeciesSubBatchAction id='removeSpeciesSubBatchAction' + constructorParams='handler'/> <BeanValidator id='validator' bean='model' errorTableModel='errorTableModel' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> @@ -127,7 +130,7 @@ <JTextField id='speciesTotalUnsortedWeightField'/> </cell> </row> - + <!-- Poids inerte / Poids vivant non détaillé --> <row> <cell> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java 2013-02-03 13:06:27 UTC (rev 308) @@ -40,6 +40,7 @@ import javax.swing.AbstractCellEditor; import javax.swing.JTable; import javax.swing.border.LineBorder; +import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import java.awt.Color; @@ -49,7 +50,6 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.List; -import javax.swing.table.DefaultTableCellRenderer; /** * Component to render and edit frequency stuff from batch table. @@ -144,7 +144,7 @@ // open frequency editor parent.getHandler().setSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD); } - + public void validateEdition(SpeciesFrequencyUIModel frequencyModel) { if (frequencyModel.isValid()) { @@ -152,12 +152,12 @@ // transfer rows to editor List<SpeciesFrequencyRowModel> frequency = Lists.newArrayList(); - + if (frequencyModel.isSimpleCountingMode()) { SpeciesFrequencyRowModel row = new SpeciesFrequencyRowModel(); row.setNumber(frequencyModel.getSimpleCount()); frequency.add(row); - + } else { for (SpeciesFrequencyRowModel row : frequencyModel.getRows()) { if (row.isValid()) { @@ -274,7 +274,7 @@ FrequencyCellComponent result = (FrequencyCellComponent) component.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); - + if (table != null) { String text; if (value == null) { @@ -286,7 +286,7 @@ result.setEnabled(editable); result.setText(text); } - + return result; } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-02-03 13:06:27 UTC (rev 308) @@ -26,7 +26,7 @@ <import> fr.ifremer.tutti.persistence.entities.referential.Caracteristic - + fr.ifremer.tutti.ui.swing.TuttiUI fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI @@ -75,13 +75,14 @@ <BeanValidator id='validator' bean='model' errorTableModel='errorTableModel' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> - <field name='lengthStepCaracteristic' component='lengthStepCaracteristicComboBox'/> + <field name='lengthStepCaracteristic' + component='lengthStepCaracteristicComboBox'/> <field name='rows' component='tableScrollPane'/> </BeanValidator> <CardLayout2Ext id='modeConfigurationLayout' constructorParams='this, "modeConfigurationPanel"'/> - + <CardLayout2Ext id='dataFieldLayout' constructorParams='this, "dataFieldPanel"'/> @@ -155,7 +156,8 @@ </JPanel> <JPanel id='simpleCountingModePanel' constraints='"simpleCountingMode"' layout='{new BorderLayout()}'> - <JLabel id='simpleCountingModeLabel' constraints='BorderLayout.CENTER'/> + <JLabel id='simpleCountingModeLabel' + constraints='BorderLayout.CENTER'/> </JPanel> </JPanel> </JPanel> @@ -187,7 +189,7 @@ </row> </Table> </JPanel> - + <JPanel id='dataFieldPanel' constraints='BorderLayout.CENTER'> <JScrollPane id='tableScrollPane' constraints='"lengthCaracteristicPmfm"'> <JXTable id='table'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-02-03 13:06:27 UTC (rev 308) @@ -43,6 +43,8 @@ import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; +import jaxx.runtime.SwingUtil; +import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -56,8 +58,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.validator.swing.SwingValidator; /** * @author tchemit <chemit@codelutin.com> @@ -75,7 +75,7 @@ * @since 0.2 */ private final SpeciesFrequencyUI ui; - + private FrequencyCellEditor frequencyEditor; private TuttiProtocol protocol; @@ -179,7 +179,7 @@ lengthStepCaracteristics = TuttiEntities.splitById(lengthStepCaracterics); SpeciesFrequencyUIModel model = getModel(); - + if (context.isProtocolFilled()) { // get loaded protocol @@ -193,9 +193,9 @@ speciesProtocol.put(sp.getSpeciesId(), sp); } // speciesProtocol = TuttiEntities.splitById(protocol.getSpecies()); - + } - + //TODO Use protocol to have lengthStepCaracteristic to use (if any protocol) initBeanComboBox(ui.getLengthStepCaracteristicComboBox(), lengthStepCaracterics, @@ -285,15 +285,15 @@ if (log.isInfoEnabled()) { log.info("closing: " + ui); } - + frequencyEditor = null; - + // evict model from validator ui.getValidator().setBean(null); // when canceling always invalid model (in that way) getModel().setValid(false); - + EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); parent.getHandler().setSelectedCard(EditCatchesUIHandler.MAIN_CARD); } @@ -392,7 +392,7 @@ public void editBatch(SpeciesBatchRowModel speciesBatch, FrequencyCellEditor editor) { frequencyEditor = editor; - + Caracteristic lengthStepCaracteristic = null; Float lengthStep = 1f; @@ -474,11 +474,11 @@ // connect model to validator ui.getValidator().setBean(model); - + model.setRows(editFrequency); model.setStep(lengthStep); model.setLengthStepCaracteristic(lengthStepCaracteristic); - + SpeciesFrequencyUIModel.ConfigurationMode mode = SpeciesFrequencyUIModel.ConfigurationMode.SIMPLE; if (protocol != null) { String speciesId = speciesBatch.getSpecies().getId(); @@ -488,7 +488,7 @@ } } model.setConfigurationMode(mode); - + // keep batch (will be used to push back editing entry) model.setBatch(speciesBatch); } @@ -500,7 +500,7 @@ } frequencyEditor.validateEdition(getModel()); - + closeUI(ui); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2013-02-03 13:06:27 UTC (rev 308) @@ -53,7 +53,7 @@ public static final String PROPERTY_RAFALE_MODE = "rafaleMode"; public static final String PROPERTY_SIMPLE_COUNTING_MODE = "simpleCountingMode"; - + public static final String PROPERTY_SIMPLE_COUNT = "simpleCount"; public static final String PROPERTY_LENGHT_STEP_CARACTERISTIC = "lengthStepCaracteristic"; @@ -106,10 +106,10 @@ * @since 0.3 */ protected Caracteristic lengthStepCaracteristic; - + /** * Number in case of simple counting mode - * + * * @since 1.0 */ protected Integer simpleCount; @@ -195,7 +195,7 @@ public boolean isRafaleMode() { return ConfigurationMode.RAFALE == configurationMode; } - + public boolean isSimpleCountingMode() { return ConfigurationMode.SIMPLE_COUNTING == configurationMode; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java 2013-02-03 13:06:27 UTC (rev 308) @@ -30,17 +30,18 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; -import java.awt.event.ActionEvent; -import java.util.List; -import javax.swing.SwingUtilities; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.SwingUtilities; +import java.awt.event.ActionEvent; +import java.util.List; + import static org.nuiton.i18n.I18n._; /** * Enable to select a species to the species selected in the protocol. - * + * * @author kmorin <kmorin@codelutin.com> * @since 1.0 */ @@ -50,9 +51,9 @@ /** Logger. */ private static final Log log = LogFactory.getLog(AddSpeciesAction.class); - + protected List<Species> allSpecies; - + public AddSpeciesAction(CreateSpeciesBatchUIHandler handler) { super(handler, "addSpecies", @@ -61,7 +62,7 @@ _("tutti.action.addSpecies.tip"), false ); - + TuttiPersistence persistenceService = getContext().getService(PersistenceService.class); allSpecies = persistenceService.getAllSpecies(); } @@ -69,27 +70,27 @@ @Override protected void doAction(ActionEvent event) { CreateSpeciesBatchUIHandler handler = getHandler(); - + List<Species> availableSpecies = handler.getModel().getAvailableSpecies(); final List<Species> species = Lists.newArrayList(allSpecies); species.removeAll(availableSpecies); - + // open the popup asynchronously because the setVisible(true) method returns // only after setVisible(false) has been called and this prevents the loading to hide. SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - Species selectedSpecies = getHandler().openAddSpeciesDialog( _("tutti.title.createBatch"), species); - if (species != null) { - CreateSpeciesBatchUIHandler handler = getHandler(); - CreateSpeciesBatchUIModel model = handler.getModel(); + @Override + public void run() { + Species selectedSpecies = getHandler().openAddSpeciesDialog(_("tutti.title.createBatch"), species); + if (species != null) { + CreateSpeciesBatchUIHandler handler = getHandler(); + CreateSpeciesBatchUIModel model = handler.getModel(); - List<Species> availableSpecies = Lists.newArrayList(model.getAvailableSpecies()); - availableSpecies.add(selectedSpecies); - model.setAvailableSpecies(availableSpecies); - model.setSpecies(selectedSpecies); - } + List<Species> availableSpecies = Lists.newArrayList(model.getAvailableSpecies()); + availableSpecies.add(selectedSpecies); + model.setAvailableSpecies(availableSpecies); + model.setSpecies(selectedSpecies); } + } }); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUI.jaxx 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUI.jaxx 2013-02-03 13:06:27 UTC (rev 308) @@ -23,14 +23,14 @@ --> <JPanel layout='{new BorderLayout()}' id='addSpeciesPopup' implements='fr.ifremer.tutti.ui.swing.TuttiUI<AddSpeciesUIModel, AddSpeciesUIHandler>'> - + <import> fr.ifremer.tutti.persistence.entities.referential.Species jaxx.runtime.swing.editor.bean.BeanComboBox </import> - - <script><![CDATA[ + <script><![CDATA[ + public AddSpeciesUI(CreateSpeciesBatchUI parentUI) { JAXXUtil.initContext(this, parentUI); AddSpeciesUIHandler handler = new AddSpeciesUIHandler(parentUI, this); @@ -42,13 +42,13 @@ ]]></script> <AddSpeciesUIHandler id='handler' - initializer='getContextValue(AddSpeciesUIHandler.class)' /> - + initializer='getContextValue(AddSpeciesUIHandler.class)'/> + <AddSpeciesUIModel id='model' initializer='getContextValue(AddSpeciesUIModel.class)'/> - + <BeanComboBox id='speciesCombo' constraints='BorderLayout.CENTER' - constructorParams='this' genericType='Species' /> + constructorParams='this' genericType='Species'/> <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH'> <JButton id='cancelButton' text='tutti.action.cancel' @@ -56,5 +56,5 @@ <JButton id='validateButton' text='tutti.action.validate' onActionPerformed='handler.closeDialog(this)'/> </JPanel> - + </JPanel> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUIHandler.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUIHandler.java 2013-02-03 13:06:27 UTC (rev 308) @@ -39,14 +39,14 @@ public class AddSpeciesUIHandler extends AbstractTuttiUIHandler<AddSpeciesUIModel> { private static final Log log = LogFactory.getLog(AddSpeciesUIHandler.class); - + protected AddSpeciesUI ui; - + public AddSpeciesUIHandler(CreateSpeciesBatchUI parentUI, AddSpeciesUI ui) { super(parentUI.getHandler().getContext()); this.ui = ui; } - + @Override public void beforeInitUI() { AddSpeciesUIModel model = new AddSpeciesUIModel(); @@ -78,5 +78,5 @@ public SwingValidator<AddSpeciesUIModel> getValidator() { return null; } - + } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUIModel.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUIModel.java 2013-02-03 13:06:27 UTC (rev 308) @@ -28,6 +28,7 @@ import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; + import java.util.List; /** @@ -37,17 +38,17 @@ public class AddSpeciesUIModel extends AbstractTuttiBeanUIModel<AddSpeciesUIModel, AddSpeciesUIModel> { public static final String PROPERTY_SPECIES = "species"; - + public static final String PROPERTY_SELECTED_SPECIES = "selectedSpecies"; - + protected List<Species> species = Lists.newArrayList(); protected Species selectedSpecies; - + public AddSpeciesUIModel() { super(AddSpeciesUIModel.class, null, null); } - + public List<Species> getSpecies() { return species; } @@ -67,5 +68,5 @@ this.selectedSpecies = selectedSpecies; firePropertyChange(PROPERTY_SELECTED_SPECIES, oldValue, selectedSpecies); } - + } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx 2013-02-03 13:06:27 UTC (rev 308) @@ -69,7 +69,7 @@ initializer='getContextValue(CreateSpeciesBatchUIModel.class)'/> <AddSpeciesAction id='addSpeciesAction' constructorParams='handler'/> - + <SwingValidatorMessageTableModel id='errorTableModel'/> <BeanValidator id='validator' bean='model' errorTableModel='errorTableModel' @@ -118,9 +118,9 @@ </cell> </row> - + </Table> - + <!-- Form Actions --> <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH'> <JButton id='cancelButton' onActionPerformed='handler.cancel()'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-02-03 13:06:27 UTC (rev 308) @@ -37,15 +37,15 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; import fr.ifremer.tutti.ui.swing.util.Cancelable; -import java.awt.Dimension; +import jaxx.runtime.SwingUtil; +import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.awt.Dimension; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.validator.swing.SwingValidator; /** * Handler of {@link CreateSpeciesBatchUI}. @@ -245,7 +245,7 @@ EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); parent.getSpeciesTabContent().getHandler().addSpeciesBatch(getModel()); - + // close dialog closeUI(ui); } @@ -255,10 +255,10 @@ AddSpeciesUIModel model = dialog.getModel(); model.setSelectedSpecies(null); model.setSpecies(species); - + openDialog(ui, dialog, title, new Dimension(400, 130)); - + return model.getSelectedSpecies(); } - + } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel.java 2013-02-03 13:06:27 UTC (rev 308) @@ -29,11 +29,11 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; - -import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.List; + /** * Model of {@link CreateSpeciesBatchUI}. * @@ -43,7 +43,7 @@ public class CreateSpeciesBatchUIModel extends AbstractTuttiBeanUIModel<CreateSpeciesBatchUIModel, CreateSpeciesBatchUIModel> { private final static Log log = LogFactory.getLog(CreateSpeciesBatchUIModel.class); - + private static final long serialVersionUID = 1L; public static final String PROPERTY_AVAILABLE_SPECIES = "availableSpecies"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchRowModel.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchRowModel.java 2013-02-03 13:06:27 UTC (rev 308) @@ -40,7 +40,7 @@ * @since 0.3 */ public class SplitSpeciesBatchRowModel - extends AbstractTuttiBeanUIModel<SplitSpeciesBatchRowModel, SplitSpeciesBatchRowModel> { + extends AbstractTuttiBeanUIModel<SplitSpeciesBatchRowModel, SplitSpeciesBatchRowModel> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx 2013-02-03 13:06:27 UTC (rev 308) @@ -73,74 +73,74 @@ <field name='sampleWeight' component='sampleWeightField'/> </BeanValidator> - <Table id='configurationPanel' fill='both' - constraints='BorderLayout.NORTH'> + <Table id='configurationPanel' fill='both' + constraints='BorderLayout.NORTH'> - <!-- SampleCategory choice --> - <row> - <cell anchor='west'> - <JLabel id='categoryLabel'/> - </cell> - <cell weightx='1.0'> - <JComboBox id='categoryComboBox'/> - </cell> - </row> + <!-- SampleCategory choice --> + <row> + <cell anchor='west'> + <JLabel id='categoryLabel'/> + </cell> + <cell weightx='1.0'> + <JComboBox id='categoryComboBox'/> + </cell> + </row> - <!-- Split as a sample or not ? --> - <row> - <cell columns='2'> - <JCheckBox id='sampleCheckBox' - onItemStateChanged='handler.setBoolean(event, "sample")'/> - </cell> - </row> + <!-- Split as a sample or not ? --> + <row> + <cell columns='2'> + <JCheckBox id='sampleCheckBox' + onItemStateChanged='handler.setBoolean(event, "sample")'/> + </cell> + </row> - <row> - <cell columns="2"> - <JSeparator/> - </cell> - </row> + <row> + <cell columns="2"> + <JSeparator/> + </cell> + </row> - <!-- Incoming Batch Species --> - <row> - <cell anchor='west'> - <JLabel id='speciesLabel'/> - </cell> - <cell weightx='1.0'> - <JTextField id='speciesField'/> - </cell> - </row> + <!-- Incoming Batch Species --> + <row> + <cell anchor='west'> + <JLabel id='speciesLabel'/> + </cell> + <cell weightx='1.0'> + <JTextField id='speciesField'/> + </cell> + </row> - <!-- Incoming Batch Total weight --> - <row> - <cell anchor='west'> - <JLabel id='batchWeightLabel'/> - </cell> - <cell weightx='1.0'> - <JTextField id='batchWeightField'/> - </cell> - </row> + <!-- Incoming Batch Total weight --> + <row> + <cell anchor='west'> + <JLabel id='batchWeightLabel'/> + </cell> + <cell weightx='1.0'> + <JTextField id='batchWeightField'/> + </cell> + </row> - <!-- Sample Total weight --> - <row> - <cell anchor='west'> - <JLabel id='sampleWeightLabel'/> - </cell> - <cell weightx='1.0'> - <JTextField id='sampleWeightField'/> - </cell> - </row> + <!-- Sample Total weight --> + <row> + <cell anchor='west'> + <JLabel id='sampleWeightLabel'/> + </cell> + <cell weightx='1.0'> + <JTextField id='sampleWeightField'/> + </cell> + </row> - </Table> + </Table> - <JScrollPane id='tableScrollPane' constraints='BorderLayout.CENTER'> - <JXTable id='table'/> - </JScrollPane> + <JScrollPane id='tableScrollPane' constraints='BorderLayout.CENTER'> + <JXTable id='table'/> + </JScrollPane> - <!-- actions --> - <JPanel id='actionPanel' layout='{new GridLayout(1, 0)}' - constraints='BorderLayout.SOUTH'> - <JButton id='cancelButton' onActionPerformed='handler.cancel()'/> - <JButton id='saveButton' onActionPerformed='handler.save()'/> - </JPanel> + <!-- actions --> + <JPanel id='actionPanel' layout='{new GridLayout(1, 0)}' + constraints='BorderLayout.SOUTH'> + <JButton id='cancelButton' onActionPerformed='handler.cancel()'/> + <JButton id='saveButton' onActionPerformed='handler.save()'/> + </JPanel> </JPanel> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-02-03 13:06:27 UTC (rev 308) @@ -39,20 +39,20 @@ import fr.ifremer.tutti.ui.swing.util.Cancelable; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; +import jaxx.runtime.SwingUtil; +import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; +import javax.swing.DefaultComboBoxModel; +import javax.swing.JComboBox; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; -import javax.swing.DefaultComboBoxModel; -import javax.swing.JComboBox; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.validator.swing.SwingValidator; /** * Handler of {@link SplitSpeciesBatchUI}. @@ -169,7 +169,7 @@ initUI(ui); SplitSpeciesBatchUIModel model = getModel(); - + // when category changed, remove selected category model.addPropertyChangeListener(SplitSpeciesBatchUIModel.PROPERTY_CATEGORY, new PropertyChangeListener() { @Override @@ -211,7 +211,7 @@ getModel().setSelectedCategory((SampleCategoryType) comboBox.getSelectedItem()); } }); - + generateTableModel(null); initTable(getTable()); @@ -224,13 +224,13 @@ if (log.isInfoEnabled()) { log.info("closing: " + ui); } - + // evict model from validator ui.getValidator().setBean(null); // when canceling always invalid model getModel().setValid(false); - + EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); parent.getHandler().setSelectedCard(EditCatchesUIHandler.MAIN_CARD); } @@ -316,7 +316,7 @@ EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); parent.getSpeciesTabContent().getHandler().splitBatch(getModel()); - + // close dialog closeUI(ui); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/CaracteristicRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/CaracteristicRowModel.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/CaracteristicRowModel.java 2013-02-03 13:06:27 UTC (rev 308) @@ -27,10 +27,10 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; + import java.io.Serializable; /** - * * @author kmorin <kmorin@codelutin.com> * @since 1.0 */ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/CaracteristicTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/CaracteristicTabUIHandler.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/CaracteristicTabUIHandler.java 2013-02-03 13:06:27 UTC (rev 308) @@ -38,33 +38,33 @@ import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import java.util.List; import jaxx.runtime.swing.editor.bean.BeanComboBox; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.List; + /** - * * @author kmorin <kmorin@codelutin.com> * @since 1.0 */ public abstract class CaracteristicTabUIHandler - <RM extends CaracteristicRowModel<RM>, + <RM extends CaracteristicRowModel<RM>, M extends CaracteristicTabUIModel<RM, M>, - TM extends AbstractTuttiTableModel<RM>> - extends AbstractTuttiTableUIHandler<RM, M> { + TM extends AbstractTuttiTableModel<RM>> + extends AbstractTuttiTableUIHandler<RM, M> { private static final Log log = LogFactory.getLog(CaracteristicTabUIHandler.class); - + public CaracteristicTabUIHandler(EditFishingOperationUI parentUi, String... properties) { super(parentUi.getHandler().getContext(), properties); } - + //------------------------------------------------------------------------// //-- AbstractTuttiTableUIHandler methods --// //------------------------------------------------------------------------// - + @Override protected TM getTableModel() { return (TM) getTable().getModel(); @@ -75,7 +75,7 @@ //TODO return row.getValue() != null; } - + @Override protected void onRowModified(int rowIndex, RM row, String propertyName, Object oldValue, Object newValue) { recomputeRowValidState(row); @@ -99,7 +99,7 @@ } } } - + //------------------------------------------------------------------------// //-- AbstractTuttiUIHandler methods --// //------------------------------------------------------------------------// @@ -113,7 +113,7 @@ public SwingValidator<M> getValidator() { return null; } - + @Override protected void onAfterSelectedRowChanged(int oldRowIndex, RM oldRow, @@ -123,7 +123,7 @@ super.onAfterSelectedRowChanged(oldRowIndex, oldRow, newRowIndex, newRow); getModel().setRemoveCaracteristicEnabled(newRow != null); } - + @Override public void beforeInitUI() { M model = createModel(); @@ -135,7 +135,7 @@ initUI(getUI()); initBeanComboBox(getKeyCombo(), Lists.<Caracteristic>newArrayList(), null); - + } @Override @@ -158,17 +158,17 @@ caracteristics.put(row.getKey(), row.getValue()); } } - + protected abstract M createModel(); - + protected abstract TuttiUI getUI(); - + protected abstract BeanComboBox<Caracteristic> getKeyCombo(); - + protected abstract CaracteristicMap getCaracteristics(FishingOperation operation); - + protected abstract List<String> getProtocolPmfmIds(TuttiProtocol protocol); - + //------------------------------------------------------------------------// //-- Public methods --// //------------------------------------------------------------------------// @@ -178,12 +178,12 @@ BeanComboBox<Caracteristic> keyCombo = getKeyCombo(); Caracteristic selectedItem = (Caracteristic) keyCombo.getSelectedItem(); TM tableModel = getTableModel(); - + RM row = tableModel.createNewRow(); row.setKey(selectedItem); // tableModel.addNewRow(row); getModel().getRows().add(row); - + int rowIndex = tableModel.getRowCount() - 1; tableModel.fireTableRowsInserted(rowIndex, rowIndex); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/CaracteristicTabUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/CaracteristicTabUIModel.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/CaracteristicTabUIModel.java 2013-02-03 13:06:27 UTC (rev 308) @@ -30,44 +30,43 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; -import fr.ifremer.tutti.ui.swing.util.table.CaracteristicRow; + import java.io.Serializable; import java.util.List; /** - * * @author kmorin <kmorin@codelutin.com> * @since 1.0 */ public abstract class CaracteristicTabUIModel<RM extends AbstractTuttiBeanUIModel<Serializable, RM>, M extends CaracteristicTabUIModel<RM, M>> - extends AbstractTuttiTableUIModel<FishingOperation, RM, M> { + extends AbstractTuttiTableUIModel<FishingOperation, RM, M> { public static final String PROPERTY_CARACTERISTIC_MAP = "caracteristicMap"; - + public static final String PROPERTY_REMOVE_CARACTERISTIC_ENABLED = "removeCaracteristicEnabled"; - + public static final String PROPERTY_AVAILABLE_CARACTERISTICS = "availableCaracteristics"; - + protected List<Caracteristic> availableCaracteristics; - + /** * Caracteristics - * + * * @since 1.0 */ protected CaracteristicMap caracteristicMap; - + /** * Can user remove a selected caracteristic? * * @since 1.0 */ protected boolean removeCaracteristicEnabled; - + public CaracteristicTabUIModel() { super(FishingOperation.class, null, null); } - + public List<Caracteristic> getAvailableCaracteristics() { return availableCaracteristics; } @@ -77,7 +76,7 @@ this.availableCaracteristics = availableCaracteristics; firePropertyChange(PROPERTY_AVAILABLE_CARACTERISTICS, oldValue, availableCaracteristics); } - + public CaracteristicMap getCaracteristicMap() { return caracteristicMap; } @@ -87,11 +86,11 @@ this.caracteristicMap = caracteristicMap != null ? (CaracteristicMap) caracteristicMap.clone() : null; firePropertyChange(PROPERTY_CARACTERISTIC_MAP, oldValue, this.caracteristicMap); } - + public boolean isRemoveCaracteristicEnabled() { return removeCaracteristicEnabled; } - + public void setRemoveCaracteristicEnabled(boolean removeCaracteristicEnabled) { Object oldValue = isRemoveCaracteristicEnabled(); this.removeCaracteristicEnabled = removeCaracteristicEnabled; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentRowModel.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentRowModel.java 2013-02-03 13:06:27 UTC (rev 308) @@ -27,10 +27,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.fishing.CaracteristicRowModel; -/** - * - * @author kmorin <kmorin@codelutin.com> - */ +/** @author kmorin <kmorin@codelutin.com> */ public class EnvironmentRowModel extends CaracteristicRowModel<EnvironmentRowModel> { } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUI.jaxx 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUI.jaxx 2013-02-03 13:06:27 UTC (rev 308) @@ -46,7 +46,7 @@ <JMenuItem id='removeCaracteristicMenu' onActionPerformed='handler.removeCaracteristic()'/> </JPopupMenu> - + <row fill='both'> <cell fill='both' weightx='1'> <BeanComboBox id='newRowKey' constructorParams='this' @@ -59,7 +59,7 @@ <row fill='both' weighty='1'> <cell fill='both' columns='2'> <JScrollPane> - <JXTable id='environmentTable' + <JXTable id='environmentTable' onMouseClicked='handler.autoSelectRowInTable(event, tablePopup)'/> </JScrollPane> </cell> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java 2013-02-03 13:06:27 UTC (rev 308) @@ -34,13 +34,14 @@ import fr.ifremer.tutti.ui.swing.content.operation.fishing.CaracteristicTabUIHandler; import fr.ifremer.tutti.ui.swing.util.editor.CaracteristicValueEditor; import fr.ifremer.tutti.ui.swing.util.editor.CaracteristicValueRenderer; -import java.util.List; import jaxx.runtime.swing.editor.bean.BeanComboBox; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; +import java.util.List; + /** * @author kmorin * @since 0.3 @@ -76,7 +77,7 @@ protected BeanComboBox<Caracteristic> getKeyCombo() { return ui.getNewRowKey(); } - + @Override protected EnvironmentTabUIModel createModel() { return new EnvironmentTabUIModel(); @@ -86,12 +87,12 @@ protected CaracteristicMap getCaracteristics(FishingOperation operation) { return operation.getEnvironmentCaracteristics(); } - + @Override protected List<String> getProtocolPmfmIds(TuttiProtocol protocol) { return protocol.getEnvironmentPmfmId(); } - + //------------------------------------------------------------------------// //-- AbstractTuttiTableUIHandler methods --// //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIModel.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIModel.java 2013-02-03 13:06:27 UTC (rev 308) @@ -33,12 +33,12 @@ public class EnvironmentTabUIModel extends CaracteristicTabUIModel<EnvironmentRowModel, EnvironmentTabUIModel> { private static final long serialVersionUID = 1L; - + public static final String TITLE = "tutti.label.tab.fishingOperation.environment"; - + @Override public String getTitle() { return TITLE; } - + } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTableModel.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTableModel.java 2013-02-03 13:06:27 UTC (rev 308) @@ -26,6 +26,7 @@ import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; + import javax.swing.table.TableColumnModel; import static org.nuiton.i18n.I18n.n_; @@ -58,5 +59,5 @@ EnvironmentRowModel result = new EnvironmentRowModel(); return result; } - + } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingRowModel.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingRowModel.java 2013-02-03 13:06:27 UTC (rev 308) @@ -27,10 +27,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.fishing.CaracteristicRowModel; -/** - * - * @author kmorin <kmorin@codelutin.com> - */ +/** @author kmorin <kmorin@codelutin.com> */ public class GearShootingRowModel extends CaracteristicRowModel<GearShootingRowModel> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUI.jaxx 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUI.jaxx 2013-02-03 13:06:27 UTC (rev 308) @@ -44,7 +44,7 @@ <JMenuItem id='removeCaracteristicMenu' onActionPerformed='handler.removeCaracteristic()'/> </JPopupMenu> - + <row fill='both'> <cell fill='both' weightx='1'> <BeanComboBox id='newRowKey' constructorParams='this' Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java 2013-02-03 13:06:27 UTC (rev 308) @@ -35,14 +35,14 @@ import fr.ifremer.tutti.ui.swing.content.operation.fishing.CaracteristicTabUIHandler; import fr.ifremer.tutti.ui.swing.util.editor.CaracteristicValueEditor; import fr.ifremer.tutti.ui.swing.util.editor.CaracteristicValueRenderer; -import java.util.List; import jaxx.runtime.swing.editor.bean.BeanComboBox; -import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; +import java.util.List; + /** * @author kmorin * @since 0.3 @@ -64,7 +64,7 @@ super(parentUi, GearShootingRowModel.PROPERTY_VALUE); this.ui = ui; } - + //------------------------------------------------------------------------// //-- CaracteristicTabUIHandler methods --// //------------------------------------------------------------------------// @@ -78,12 +78,12 @@ protected BeanComboBox<Caracteristic> getKeyCombo() { return ui.getNewRowKey(); } - + @Override protected GearShootingTabUIModel createModel() { return new GearShootingTabUIModel(); } - + @Override protected CaracteristicMap getCaracteristics(FishingOperation operation) { return operation.getGearShootingCaracteristics(); @@ -93,7 +93,7 @@ protected List<String> getProtocolPmfmIds(TuttiProtocol protocol) { return protocol.getGearPmfmId(); } - + //------------------------------------------------------------------------// //-- AbstractTuttiTableUIHandler methods --// //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIModel.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIModel.java 2013-02-03 13:06:27 UTC (rev 308) @@ -24,7 +24,6 @@ * #L% */ -import fr.ifremer.tutti.ui.swing.content.operation.fishing.CaracteristicRowModel; import fr.ifremer.tutti.ui.swing.content.operation.fishing.CaracteristicTabUIModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -37,14 +36,14 @@ public class GearShootingTabUIModel extends CaracteristicTabUIModel<GearShootingRowModel, GearShootingTabUIModel> { private static final long serialVersionUID = 1L; - + private static final Log log = LogFactory.getLog(GearShootingTabUIModel.class); - + public static final String TITLE = "tutti.label.tab.fishingOperation.gearShooting"; @Override public String getTitle() { return TITLE; } - + } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUI.jaxx 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUI.jaxx 2013-02-03 13:06:27 UTC (rev 308) @@ -46,7 +46,7 @@ <JMenuItem id='removeCaracteristicMenu' onActionPerformed='handler.removeCaracteristic()'/> </JPopupMenu> - + <row fill='both'> <cell fill='both' weightx='1'> <BeanComboBox id='newRowKey' constructorParams='this' Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java 2013-02-03 13:06:27 UTC (rev 308) @@ -36,7 +36,6 @@ import fr.ifremer.tutti.ui.swing.util.editor.CaracteristicValueEditor; import fr.ifremer.tutti.ui.swing.util.editor.CaracteristicValueRenderer; import jaxx.runtime.swing.editor.bean.BeanComboBox; -import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; @@ -208,7 +207,7 @@ table.setColumnModel(columnModel); initTable(table); } - + //------------------------------------------------------------------------// //-- Public methods --// //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2013-02-03 13:06:27 UTC (rev 308) @@ -30,12 +30,13 @@ import fr.ifremer.tutti.ui.swing.MainUI; import fr.ifremer.tutti.ui.swing.TuttiScreen; import fr.ifremer.tutti.ui.swing.TuttiUI; -import java.awt.event.ActionEvent; -import javax.swing.JOptionPane; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.JOptionPane; +import java.awt.event.ActionEvent; + /** * Handler of UI {@link EditProgramUI}. * @@ -136,7 +137,7 @@ } return result; } - + @Override public EditProgramUIModel getModel() { return ui.getModel(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/SaveProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/SaveProgramAction.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/SaveProgramAction.java 2013-02-03 13:06:27 UTC (rev 308) @@ -29,17 +29,16 @@ import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; -import fr.ifremer.tutti.ui.swing.ChangeScreenAction; import fr.ifremer.tutti.ui.swing.TuttiScreen; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import java.awt.event.ActionEvent; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.awt.event.ActionEvent; + import static org.nuiton.i18n.I18n._; /** - * * @author kmorin <kmorin@codelutin.com> * @since 1.0 */ @@ -59,11 +58,12 @@ true ); } - + /** * If the event source is a TuttiScreen, then the screen changes to the source. * Otherwise, the screen changes to the home. - * @param event + * + * @param event */ @Override protected void doAction(ActionEvent event) { @@ -82,7 +82,7 @@ } context.setProgramId(saved.getId()); - + TuttiScreen nextScreen; if (event.getSource().getClass().isAssignableFrom(TuttiScreen.class)) { nextScreen = (TuttiScreen) event.getSource(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-02-03 13:06:27 UTC (rev 308) @@ -38,7 +38,6 @@ import fr.ifremer.tutti.ui.swing.content.home.ImportProtocolAction; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import java.awt.event.ActionEvent; import jaxx.runtime.swing.editor.bean.BeanDoubleList; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections.CollectionUtils; @@ -47,9 +46,10 @@ import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; +import javax.swing.JOptionPane; +import java.awt.event.ActionEvent; import java.util.List; import java.util.Map; -import javax.swing.JOptionPane; /** @@ -349,7 +349,7 @@ } return result; } - + @Override protected void onAfterSelectedRowChanged(int oldRowIndex, EditProtocolSpeciesRowModel oldRow, Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java 2013-02-03 13:06:27 UTC (rev 308) @@ -105,7 +105,7 @@ getContext().getService(TuttiProtocolImportExportService.class); List<Caracteristic> allCaracteristic = getHandler().getAllCaracteristic(); - Map<String,Caracteristic> caracteristicMap = TuttiEntities.splitById(allCaracteristic); + Map<String, Caracteristic> caracteristicMap = TuttiEntities.splitById(allCaracteristic); service.importProtocolCaracteristic(file, protocol, caracteristicMap); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java 2013-02-03 13:06:27 UTC (rev 308) @@ -43,7 +43,7 @@ /** * Saves a protocol - * + * * @author kmorin <kmorin@codelutin.com> * @since 1.0 */ @@ -67,7 +67,8 @@ /** * If the event source is a TuttiScreen, then the screen changes to the source. * Otherwise, the screen changes to the home. - * @param event + * + * @param event */ @Override protected void doAction(ActionEvent event) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java 2013-02-03 13:06:27 UTC (rev 308) @@ -29,15 +29,16 @@ import fr.ifremer.tutti.ui.swing.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.TuttiUI; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import java.awt.Component; -import javax.swing.DefaultSingleSelectionModel; -import javax.swing.JTabbedPane; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.DefaultSingleSelectionModel; +import javax.swing.JTabbedPane; +import java.awt.Component; + /** * UI containing a tab panel. - * + * * @param <M> type of the ui model * @author kmorin <kmorin@codelutin.com> * @since 0.3 @@ -45,21 +46,21 @@ public abstract class AbstractTuttiTabContainerUIHandler<M> extends AbstractTuttiUIHandler<M> { private final static Log log = LogFactory.getLog(AbstractTuttiTabContainerUIHandler.class); - + protected AbstractTuttiTabContainerUIHandler(TuttiUIContext context) { super(context); } - + /** @return the tab panel of the UI */ protected abstract JTabbedPane getTabPanel(); - + /** * Method called when the user selects a tab - * + * * @param currentIndex * @param newIndex * @return <code>false</code> if you want to prevent the tab change, - * <code>true</code> otherwise + * <code>true</code> otherwise */ protected boolean onTabChanged(int currentIndex, int newIndex) { boolean result = true; @@ -76,14 +77,14 @@ } return result; } - + /** * Returns the tab handler of the tab i. - * + * * @param index the index of the tab - * @return the tab handler of the index i if the handler implements - * the {@link TabHandler} interface, - * <code>null</code> otherwise + * @return the tab handler of the index i if the handler implements + * the {@link TabHandler} interface, + * <code>null</code> otherwise */ protected TabHandler getTabHandler(int index) { TabHandler tabHandler = null; @@ -100,11 +101,11 @@ } return tabHandler; } - + @Override protected void initUI(TuttiUI ui) { super.initUI(ui); - + final JTabbedPane tabPanel = getTabPanel(); tabPanel.setModel(new DefaultSingleSelectionModel() { @@ -112,20 +113,20 @@ public void setSelectedIndex(int index) { int currentIndex = tabPanel.getSelectedIndex(); boolean mustChangeTab = onTabChanged(currentIndex, index); - + if (mustChangeTab) { super.setSelectedIndex(index); } } - + }); } - + /** * Sets a {@link CustomTab} as tab component. - * + * * @param index - * @param model + * @param model */ protected void setCustomTab(int index, AbstractTuttiBeanUIModel model) { getTabPanel().setTabComponentAt(index, new CustomTab(model)); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/ActionListCellRenderer.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/ActionListCellRenderer.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/ActionListCellRenderer.java 2013-02-03 13:06:27 UTC (rev 308) @@ -32,11 +32,11 @@ import java.awt.Component; /** -* TODO -* -* @author tchemit <chemit@codelutin.com> -* @since 1.0 -*/ + * TODO + * + * @author tchemit <chemit@codelutin.com> + * @since 1.0 + */ public class ActionListCellRenderer extends DefaultListCellRenderer { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/CustomTab.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/CustomTab.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/CustomTab.java 2013-02-03 13:06:27 UTC (rev 308) @@ -26,30 +26,31 @@ */ import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; -import java.awt.Color; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import javax.swing.JLabel; -import javax.swing.JPanel; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.JLabel; +import javax.swing.JPanel; +import java.awt.Color; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; + import static org.nuiton.i18n.I18n._; /** - * Custom tab component which adds a * in the end of the title + * Custom tab component which adds a * in the end of the title * when the content is modified. - * + * * @author kmorin <kmorin@codelutin.com> * @since 0.3 */ public class CustomTab extends JPanel { private Log log = LogFactory.getLog(CustomTab.class); - + protected AbstractTuttiBeanUIModel model; - + protected JLabel title = new JLabel(); public AbstractTuttiBeanUIModel getModel() { @@ -69,9 +70,9 @@ CustomTab.this.title.setText(title); } }); - + setBackground(null); - + title.setText(_(model.getTitle())); String actionIcon = model.getIcon(); if (actionIcon != null) { @@ -96,5 +97,5 @@ title.setForeground(fg); } } - + } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/SwingValidatorMessageWidget.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/SwingValidatorMessageWidget.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/SwingValidatorMessageWidget.java 2013-02-03 13:06:27 UTC (rev 308) @@ -25,6 +25,27 @@ * #L% */ +import jaxx.runtime.SwingUtil; +import jaxx.runtime.validator.swing.SwingValidator; +import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; +import jaxx.runtime.validator.swing.SwingValidatorMessageTableRenderer; +import jaxx.runtime.validator.swing.SwingValidatorUtil; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXTitledPanel; +import org.nuiton.validator.NuitonValidatorScope; + +import javax.swing.AbstractAction; +import javax.swing.JComponent; +import javax.swing.JDialog; +import javax.swing.JRootPane; +import javax.swing.JScrollPane; +import javax.swing.JTable; +import javax.swing.JToggleButton; +import javax.swing.KeyStroke; +import javax.swing.ListSelectionModel; +import javax.swing.event.TableModelEvent; +import javax.swing.event.TableModelListener; import java.awt.Component; import java.awt.Point; import java.awt.event.ActionEvent; @@ -36,35 +57,14 @@ import java.awt.event.KeyEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.swing.AbstractAction; -import javax.swing.JComponent; -import javax.swing.JDialog; -import javax.swing.JRootPane; -import javax.swing.JScrollPane; -import javax.swing.JTable; -import javax.swing.JToggleButton; -import javax.swing.KeyStroke; -import javax.swing.ListSelectionModel; -import javax.swing.event.TableModelEvent; -import javax.swing.event.TableModelListener; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.validator.swing.SwingValidator; -import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; -import jaxx.runtime.validator.swing.SwingValidatorMessageTableRenderer; -import jaxx.runtime.validator.swing.SwingValidatorUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.JXTitledPanel; import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; -import org.nuiton.validator.NuitonValidatorScope; - /** - * Button which opens a popup containing a table with the errors found + * Button which opens a popup containing a table with the errors found * by registered validators. - * + * * @author kmorin <kmorin@codelutin.com> * @since 2.5.10 */ @@ -76,17 +76,17 @@ private static final long serialVersionUID = 1L; protected SwingValidatorMessageTableModel errorTableModel = new SwingValidatorMessageTableModel(); - + protected JDialog popup = new JDialog(); - + protected JTable errorTable = new JTable(); - + protected Point popupPosition = null; - + public SwingValidatorMessageWidget() { super(SwingUtil.createActionIcon("alert-none")); setToolTipText(_("tutti.validator.alert.none")); - + errorTableModel.addTableModelListener(new TableModelListener() { public void tableChanged(TableModelEvent e) { @@ -102,15 +102,15 @@ default: label = n_("tutti.validator.alert.several"); } - + NuitonValidatorScope maxScope; String icon; if (alerts == 0) { icon = "alert-none"; - + } else { maxScope = NuitonValidatorScope.INFO; - for (int i = 0 ; i < alerts ; i++) { + for (int i = 0; i < alerts; i++) { NuitonValidatorScope scope = errorTableModel.getRow(i).getScope(); int diff = scope.compareTo(maxScope); if (diff < 0) { @@ -118,7 +118,7 @@ } } switch (maxScope) { - case INFO: + case INFO: icon = "alert-info"; break; case WARNING: @@ -129,12 +129,12 @@ } } - + setToolTipText(_(label, alerts)); setIcon(SwingUtil.createActionIcon(icon)); } }); - + errorTable.setModel(errorTableModel); errorTable.setRowSelectionAllowed(true); errorTable.setAutoCreateRowSorter(true); @@ -142,26 +142,26 @@ errorTable.setCellSelectionEnabled(false); errorTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); errorTable.setFillsViewportHeight(true); - + SwingValidatorUtil.installUI(errorTable, new SwingValidatorMessageTableRenderer()); - + JScrollPane scrollPanel = new JScrollPane(errorTable); scrollPanel.setColumnHeaderView(errorTable.getTableHeader()); - + JXTitledPanel titledPanel = new JXTitledPanel(_("tutti.errorTable.title"), scrollPanel); popup.add(titledPanel); popup.setTitle(_("tutti.errorTable.title")); popup.setSize(800, 300); popup.setAlwaysOnTop(true); popup.setUndecorated(true); - + ComponentResizer cr = new ComponentResizer(); cr.registerComponent(popup); ComponentMover cm = new ComponentMover(); cm.setDragInsets(cr.getDragInsets()); cm.registerComponent(popup); - + popup.addWindowListener(new WindowAdapter() { @Override @@ -170,7 +170,7 @@ } }); - + popup.addComponentListener(new ComponentAdapter() { @Override @@ -180,21 +180,21 @@ popupPosition = component.getLocationOnScreen(); } } - + }); - + addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - if(isSelected()) { + if (isSelected()) { popup.setVisible(true); } else { popup.dispose(); } } }); - + addHierarchyBoundsListener(new HierarchyBoundsAdapter() { @Override @@ -206,7 +206,7 @@ } } }); - + // add a auto-close action JRootPane rootPane = popup.getRootPane(); @@ -225,17 +225,17 @@ }); } - + /** * Registers a validator. - * - * @param validator + * + * @param validator */ public void registerValidator(SwingValidator validator) { errorTableModel.registerValidator(validator); validator.reloadBean(); } - + /** Clears all the validators. */ public void clearValidators() { errorTableModel.clearValidators(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TabHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TabHandler.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TabHandler.java 2013-02-03 13:06:27 UTC (rev 308) @@ -33,18 +33,19 @@ */ public interface TabHandler { - /** + /** * Method called when the tab is hidden - * + * * @param currentIndex * @param newIndex * @return <code>false</code> to prevent the tab to be hidden, - * <code>true</code> otherwise. + * <code>true</code> otherwise. */ boolean onHideTab(int currentIndex, int newIndex); - - /** - * Method called when the tab is shown + + /** + * Method called when the tab is shown + * * @param currentIndex * @param newIndex */ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java 2013-02-03 13:06:27 UTC (rev 308) @@ -44,6 +44,7 @@ import javax.swing.JDialog; import javax.swing.JTable; import javax.swing.border.LineBorder; +import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import java.awt.Color; @@ -56,7 +57,6 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.util.Collection; -import javax.swing.table.DefaultTableCellRenderer; import static org.nuiton.i18n.I18n._; @@ -82,7 +82,7 @@ protected void setValue(Object value) { // do nothing } - + public static TableCellRenderer newRender(Decorator<Attachment> decorator, String noneText) { return new AttachmentCellRenderer(decorator, noneText); } @@ -281,9 +281,9 @@ int column) { AttachmentCellComponent result = (AttachmentCellComponent) component.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); - + if (table != null) { - + String textValue; if (value == null) { if (propertyName == null) { @@ -309,7 +309,7 @@ result.setEnabled(editable); result.setToolTipText(text); } - + return result; } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/CoordinateEditorType.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/CoordinateEditorType.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/CoordinateEditorType.java 2013-02-03 13:06:27 UTC (rev 308) @@ -26,12 +26,11 @@ */ /** - * * @author kmorin <kmorin@codelutin.com> * @since 1.0 */ public enum CoordinateEditorType { DMS, DD, DMD - + } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java 2013-02-03 13:06:27 UTC (rev 308) @@ -32,7 +32,6 @@ import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; -import java.awt.Color; import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; import org.apache.commons.lang3.StringUtils; @@ -44,8 +43,10 @@ import javax.swing.JDialog; import javax.swing.JTable; import javax.swing.border.LineBorder; +import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; +import java.awt.Color; import java.awt.Component; import java.awt.Frame; import java.awt.event.KeyAdapter; @@ -54,7 +55,6 @@ import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.swing.table.DefaultTableCellRenderer; import static org.nuiton.i18n.I18n._; @@ -278,9 +278,9 @@ int row, int column) { - LongTextCellComponent result = + LongTextCellComponent result = (LongTextCellComponent) component.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); - + if (table != null) { String textValue; if (StringUtils.isBlank((String) value)) { @@ -305,7 +305,7 @@ result.setEnabled(editable); result.setToolTipText(text); } - + return result; } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-02-03 13:06:27 UTC (rev 308) @@ -123,10 +123,10 @@ * @since 0.3 */ protected void onRowModified(int rowIndex, - R row, - String propertyName, - Object oldValue, - Object newValue) { + R row, + String propertyName, + Object oldValue, + Object newValue) { getModel().setModify(true); } @@ -293,11 +293,11 @@ Highlighter readOnlyHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( HighlightPredicate.READ_ONLY, getConfig().getColorRowReadOnly()); table.addHighlighter(readOnlyHighlighter); - + Color cellWithValueColor = getConfig().getColorCellWithValue(); Highlighter commentHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( new HighlightPredicate.AndHighlightPredicate( - new HighlightPredicate.IdentifierHighlightPredicate(SpeciesBatchTableModel.COMMENT), + new HighlightPredicate.IdentifierHighlightPredicate(SpeciesBatchTableModel.COMMENT), new HighlightPredicate() { @Override public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { @@ -306,10 +306,10 @@ } }), cellWithValueColor); table.addHighlighter(commentHighlighter); - + Highlighter attachmentHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( new HighlightPredicate.AndHighlightPredicate( - new HighlightPredicate.IdentifierHighlightPredicate(SpeciesBatchTableModel.ATTACHMENTS), + new HighlightPredicate.IdentifierHighlightPredicate(SpeciesBatchTableModel.ATTACHMENTS), new HighlightPredicate() { @Override public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { @@ -645,7 +645,7 @@ // apply it to row row.setValid(valid); - + if (valid) { getModel().removeRowInError(row); } else { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIModel.java 2013-02-03 13:01:21 UTC (rev 307) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIModel.java 2013-02-03 13:06:27 UTC (rev 308) @@ -28,15 +28,15 @@ import com.google.common.collect.Sets; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.content.operation.fishing.environment.EnvironmentRowModel; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.beans.Binder; + import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.HashSet; -import org.nuiton.util.beans.Binder; - import java.util.List; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * @param <E> type of incoming bean to edit @@ -50,13 +50,13 @@ private static final long serialVersionUID = 1L; private static final Log log = LogFactory.getLog(AbstractTuttiTableUIModel.class); - + public static final String PROPERTY_ROWS = "rows"; - + public static final String PROPERTY_ROWS_IN_ERROR = "rowsInError"; protected List<R> rows; - + protected Set<R> rowsInError; protected AbstractTuttiTableUIModel(Class<E> entityType, @@ -87,7 +87,7 @@ // always propagates (since empty list will not fire and we want it) firePropertyChange(PROPERTY_ROWS, null, rows); - + Set<R> rowsInError = Sets.newHashSet(); for (R row : rows) { if (!row.isValid()) { @@ -100,7 +100,7 @@ public int getRowCount() { return rows == null ? 0 : rows.size(); } - + public Set<R> getRowsInError() { return rowsInError; } @@ -109,12 +109,12 @@ this.rowsInError = rowsInError; firePropertyChange(PROPERTY_ROWS_IN_ERROR, null, rowsInError); } - + public void addRowInError(R row) { rowsInError.add(row); firePropertyChange(PROPERTY_ROWS_IN_ERROR, null, rowsInError); } - + public void removeRowInError(R row) { rowsInError.remove(row); firePropertyChange(PROPERTY_ROWS_IN_ERROR, null, rowsInError);