Author: kmorin Date: 2013-03-11 11:41:20 +0100 (Mon, 11 Mar 2013) New Revision: 574 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/574 Log: fixes #1971 [ERGO] - Gestion des listes d?\195?\169roulantes - Fonctionnalit?\195?\169 de filtrage / recherche Modified: trunk/tutti-ui-swing/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 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/home/SelectCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx 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/catches/species/SelectSpeciesUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 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/split/CreateSpeciesBatchUI.css 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/SplitSpeciesBatchUI.css 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/fishing/AbstractCaracteristicTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx 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/protocol/AddSpeciesProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 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/ImportProtocolSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/pom.xml 2013-03-11 10:41:20 UTC (rev 574) @@ -7,15 +7,15 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public + + You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/gpl-3.0.html>. #L% Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-03-11 10:41:20 UTC (rev 574) @@ -22,7 +22,7 @@ * #L% */ -BeanComboBox { +BeanFilterableComboBox { showReset: true; i18nPrefix: "tutti.property."; bean: {model}; 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-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2013-03-11 10:41:20 UTC (rev 574) @@ -37,7 +37,7 @@ fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment jaxx.runtime.swing.editor.NumberEditor - jaxx.runtime.swing.editor.bean.BeanComboBox + jaxx.runtime.swing.editor.bean.BeanFilterableComboBox jaxx.runtime.swing.editor.bean.BeanListHeader jaxx.runtime.swing.editor.bean.BeanDoubleList @@ -107,7 +107,7 @@ <JLabel id='programLabel'/> </cell> <cell weightx='1'> - <BeanComboBox id='programComboBox' constructorParams='this' + <BeanFilterableComboBox id='programComboBox' constructorParams='this' genericType='Program'/> </cell> <cell anchor='west'> @@ -152,7 +152,7 @@ <JLabel id='countryLabel'/> </cell> <cell weightx='0.3'> - <BeanComboBox id='countryComboBox' constructorParams='this' + <BeanFilterableComboBox id='countryComboBox' constructorParams='this' genericType='Country'/> </cell> <cell> 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-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-03-11 10:41:20 UTC (rev 574) @@ -191,11 +191,11 @@ } }); - initBeanComboBox(ui.getProgramComboBox(), + initBeanFilterableComboBox(ui.getProgramComboBox(), persistenceService.getAllProgram(), model.getProgram()); - initBeanComboBox(ui.getCountryComboBox(), + initBeanFilterableComboBox(ui.getCountryComboBox(), persistenceService.getAllCountry(), model.getCountry()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2013-03-11 10:41:20 UTC (rev 574) @@ -22,7 +22,7 @@ * #L% */ -BeanComboBox { +BeanFilterableComboBox { showReset: true; i18nPrefix: "tutti.property."; bean: {model}; 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-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2013-03-11 10:41:20 UTC (rev 574) @@ -34,7 +34,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.ActionListCellRenderer - jaxx.runtime.swing.editor.bean.BeanComboBox + jaxx.runtime.swing.editor.bean.BeanFilterableComboBox static org.nuiton.i18n.I18n._ </import> @@ -86,7 +86,7 @@ <JLabel id='programLabel'/> </cell> <cell weightx='1.0'> - <BeanComboBox id='programCombobox' constructorParams='this' + <BeanFilterableComboBox id='programCombobox' constructorParams='this' genericType='Program'/> </cell> <cell> @@ -101,7 +101,7 @@ <JLabel id='cruiseLabel'/> </cell> <cell> - <BeanComboBox id='cruiseCombobox' constructorParams='this' + <BeanFilterableComboBox id='cruiseCombobox' constructorParams='this' genericType='Cruise'/> </cell> <cell> @@ -116,7 +116,7 @@ <JLabel id='protocolLabel'/> </cell> <cell> - <BeanComboBox id='protocolCombobox' constructorParams='this' + <BeanFilterableComboBox id='protocolCombobox' constructorParams='this' genericType='TuttiProtocol'/> </cell> <cell> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-03-11 10:41:20 UTC (rev 574) @@ -45,6 +45,7 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; /** * Main ui content to select cruise. @@ -138,15 +139,15 @@ SelectCruiseUIModel model = getModel(); - initBeanComboBox(ui.getProgramCombobox(), + initBeanFilterableComboBox(ui.getProgramCombobox(), model.getPrograms(), model.getProgram()); - initBeanComboBox(ui.getCruiseCombobox(), + initBeanFilterableComboBox(ui.getCruiseCombobox(), model.getCruises(), model.getCruise()); - initBeanComboBox(ui.getProtocolCombobox(), + initBeanFilterableComboBox(ui.getProtocolCombobox(), model.getProtocols(), model.getProtocol()); @@ -157,7 +158,7 @@ @Override public void propertyChange(PropertyChangeEvent evt) { // reload combo box - BeanComboBox<TuttiProtocol> combobox = ui.getProtocolCombobox(); + BeanFilterableComboBox<TuttiProtocol> combobox = ui.getProtocolCombobox(); List<TuttiProtocol> protocols = (List<TuttiProtocol>) evt.getNewValue(); combobox.setData(null); @@ -189,7 +190,7 @@ @Override public void propertyChange(PropertyChangeEvent evt) { // reload combo box - BeanComboBox<Cruise> combobox = ui.getCruiseCombobox(); + BeanFilterableComboBox<Cruise> combobox = ui.getCruiseCombobox(); List<Cruise> campaigns = (List<Cruise>) evt.getNewValue(); combobox.setData(null); combobox.setData(campaigns); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-03-11 10:41:20 UTC (rev 574) @@ -26,7 +26,7 @@ floatable: false; } -BeanComboBox { +BeanFilterableComboBox { showReset: true; i18nPrefix: "tutti.property."; bean: {model}; 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-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2013-03-11 10:41:20 UTC (rev 574) @@ -41,7 +41,7 @@ fr.ifremer.tutti.ui.swing.util.editor.CoordinateEditorType fr.ifremer.tutti.ui.swing.util.editor.SimpleTimeEditor - jaxx.runtime.swing.editor.bean.BeanComboBox + jaxx.runtime.swing.editor.bean.BeanFilterableComboBox jaxx.runtime.swing.editor.bean.BeanListHeader jaxx.runtime.swing.editor.bean.BeanDoubleList jaxx.runtime.swing.editor.NumberEditor @@ -205,22 +205,25 @@ <JLabel id='strataLabel'/> </cell> <cell weightx='0.3'> - <BeanComboBox id='strataComboBox' constructorParams='this' - genericType='FishingOperationLocation'/> + <BeanFilterableComboBox id='strataComboBox' + constructorParams='this' + genericType='FishingOperationLocation'/> </cell> <cell> <JLabel id='subStrataLabel'/> </cell> <cell weightx='0.3'> - <BeanComboBox id='subStrataComboBox' constructorParams='this' - genericType='FishingOperationLocation'/> + <BeanFilterableComboBox id='subStrataComboBox' + constructorParams='this' + genericType='FishingOperationLocation'/> </cell> <cell> <JLabel id='locationLabel'/> </cell> <cell weightx='0.3'> - <BeanComboBox id='locationComboBox' constructorParams='this' - genericType='FishingOperationLocation'/> + <BeanFilterableComboBox id='locationComboBox' + constructorParams='this' + genericType='FishingOperationLocation'/> </cell> </row> @@ -475,9 +478,9 @@ <JLabel id='vesselLabel'/> </cell> <cell weightx="1.0" fill="both"> - <BeanComboBox id='vesselComboBox' - constructorParams='this' - genericType='Vessel'/> + <BeanFilterableComboBox id='vesselComboBox' + constructorParams='this' + genericType='Vessel'/> </cell> </row> <row> @@ -485,9 +488,9 @@ <JLabel id='gearLabel'/> </cell> <cell> - <BeanComboBox id='gearComboBox' - constructorParams='this' - genericType='Gear'/> + <BeanFilterableComboBox id='gearComboBox' + constructorParams='this' + genericType='Gear'/> </cell> </row> </Table> 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-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-03-11 10:41:20 UTC (rev 574) @@ -247,11 +247,11 @@ people, model.getRecorderPerson()); - initBeanComboBox(ui.getVesselComboBox(), + initBeanFilterableComboBox(ui.getVesselComboBox(), Lists.<Vessel>newArrayList(), null); - initBeanComboBox(ui.getGearComboBox(), + initBeanFilterableComboBox(ui.getGearComboBox(), Lists.<Gear>newArrayList(), null); @@ -285,11 +285,11 @@ List<FishingOperationLocation> locations = persistenceService.getAllFishingOperationLocation(zoneId, strataId, substrataId); - initBeanComboBox(ui.getStrataComboBox(), stratas, strata); + initBeanFilterableComboBox(ui.getStrataComboBox(), stratas, strata); - initBeanComboBox(ui.getSubStrataComboBox(), subStratas, subStrata); + initBeanFilterableComboBox(ui.getSubStrataComboBox(), subStratas, subStrata); - initBeanComboBox(ui.getLocationComboBox(), locations, location); + initBeanFilterableComboBox(ui.getLocationComboBox(), locations, location); model.setEmpty(true); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css 2013-03-11 10:41:20 UTC (rev 574) @@ -22,7 +22,7 @@ * #L% */ -BeanComboBox { +BeanFilterableComboBox { showReset: true; i18nPrefix: "tutti.property."; bean: {model}; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx 2013-03-11 10:41:20 UTC (rev 574) @@ -33,7 +33,7 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI fr.ifremer.tutti.ui.swing.util.TuttiUI - jaxx.runtime.swing.editor.bean.BeanComboBox + jaxx.runtime.swing.editor.bean.BeanFilterableComboBox static org.nuiton.i18n.I18n._ </import> @@ -65,8 +65,9 @@ <!-- Cruise fishingOperations --> <row> <cell anchor='west' weightx='1.0'> - <BeanComboBox id='fishingOperationComboBox' constructorParams='this' - genericType='FishingOperation'/> + <BeanFilterableComboBox id='fishingOperationComboBox' + constructorParams='this' + genericType='FishingOperation'/> </cell> <cell anchor='east'> <JButton id='newFishingOperationButton'/> 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-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-03-11 10:41:20 UTC (rev 574) @@ -120,7 +120,7 @@ List<FishingOperation> fishingOperations = model.getFishingOperation(); - initBeanComboBox(ui.getFishingOperationComboBox(), + initBeanFilterableComboBox(ui.getFishingOperationComboBox(), fishingOperations, model.getSelectedFishingOperation()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.jaxx 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.jaxx 2013-03-11 10:41:20 UTC (rev 574) @@ -27,7 +27,7 @@ <import> fr.ifremer.tutti.persistence.entities.referential.Species fr.ifremer.tutti.ui.swing.util.TuttiUI - jaxx.runtime.swing.editor.bean.BeanComboBox + jaxx.runtime.swing.editor.bean.BeanFilterableComboBox </import> <script><![CDATA[ @@ -48,8 +48,8 @@ <SelectSpeciesUIModel id='model' initializer='getContextValue(SelectSpeciesUIModel.class)'/> - <BeanComboBox id='speciesCombo' constraints='BorderLayout.CENTER' - constructorParams='this' genericType='Species'/> + <BeanFilterableComboBox id='speciesCombo' constraints='BorderLayout.CENTER' + constructorParams='this' genericType='Species'/> <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH'> <JButton id='cancelButton' Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIHandler.java 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIHandler.java 2013-03-11 10:41:20 UTC (rev 574) @@ -58,7 +58,7 @@ public void afterInitUI() { initUI(ui); - initBeanComboBox(ui.getSpeciesCombo(), + initBeanFilterableComboBox(ui.getSpeciesCombo(), Lists.<Species>newArrayList(), null); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-03-11 10:41:20 UTC (rev 574) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -555,7 +555,7 @@ addColumnToModel(columnModel, null, - newTableCellRender(Species.class, DecoratorService.getSpeciesContext(protocolFilled)), + newTableCellRender(Species.class), SpeciesBatchTableModel.SPECIES); } @@ -1199,7 +1199,4 @@ return model.getSelectedSpecies(); } - public void test() { - JOptionPane.showMessageDialog(ui, Arrays.toString(getTable().getSelectedRows())); - } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-03-11 10:41:20 UTC (rev 574) @@ -22,7 +22,7 @@ * #L% */ -BeanComboBox { +BeanFilterableComboBox { showReset: true; i18nPrefix: "tutti.property."; bean: {model}; 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-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-03-11 10:41:20 UTC (rev 574) @@ -35,7 +35,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUI jaxx.runtime.swing.CardLayout2Ext - jaxx.runtime.swing.editor.bean.BeanComboBox + jaxx.runtime.swing.editor.bean.BeanFilterableComboBox jaxx.runtime.swing.editor.NumberEditor org.jdesktop.swingx.JXTable @@ -173,9 +173,9 @@ <JLabel id='lengthStepCaracteristicLabel'/> </cell> <cell weightx='1.0'> - <BeanComboBox id='lengthStepCaracteristicComboBox' - constructorParams='this' - genericType='Caracteristic'/> + <BeanFilterableComboBox id='lengthStepCaracteristicComboBox' + constructorParams='this' + genericType='Caracteristic'/> </cell> </row> <!-- Step --> 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-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-03-11 10:41:20 UTC (rev 574) @@ -201,7 +201,7 @@ } - initBeanComboBox(ui.getLengthStepCaracteristicComboBox(), + initBeanFilterableComboBox(ui.getLengthStepCaracteristicComboBox(), lengthStepCaracterics, model.getLengthStepCaracteristic()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.css 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.css 2013-03-11 10:41:20 UTC (rev 574) @@ -22,7 +22,7 @@ * #L% */ -BeanComboBox { +BeanFilterableComboBox { showReset: true; i18nPrefix: "tutti.property."; bean: {model}; @@ -69,6 +69,7 @@ #sortedUnsortedCategoryComboBox { property: sortedUnsortedCategory; selectedItem: {model.getSortedUnsortedCategory()}; + filterable: false; } #batchWeightLabel { 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-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx 2013-03-11 10:41:20 UTC (rev 574) @@ -39,7 +39,7 @@ org.jdesktop.swingx.JXTable - jaxx.runtime.swing.editor.bean.BeanComboBox + jaxx.runtime.swing.editor.bean.BeanFilterableComboBox jaxx.runtime.swing.editor.NumberEditor javax.swing.ListSelectionModel @@ -87,7 +87,7 @@ <JLabel id='speciesLabel'/> </cell> <cell weightx='1.0'> - <BeanComboBox id='speciesComboBox' constructorParams='this' + <BeanFilterableComboBox id='speciesComboBox' constructorParams='this' genericType='Species'/> </cell> <cell> @@ -101,7 +101,7 @@ <JLabel id='sortedUnsortedCategoryLabel'/> </cell> <cell weightx='1.0' columns='2'> - <BeanComboBox id='sortedUnsortedCategoryComboBox' + <BeanFilterableComboBox id='sortedUnsortedCategoryComboBox' constructorParams='this' genericType='CaracteristicQualitativeValue'/> </cell> 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-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-03-11 10:41:20 UTC (rev 574) @@ -101,15 +101,14 @@ boolean protocolFilled = context.isProtocolFilled(); - initBeanComboBox(ui.getSpeciesComboBox(), + initBeanFilterableComboBox(ui.getSpeciesComboBox(), Lists.<Species>newArrayList(), - null, - DecoratorService.getSpeciesContext(protocolFilled)); + null); Caracteristic caracteristic = persistenceService.getSortedUnsortedCaracteristic(); - initBeanComboBox(ui.getSortedUnsortedCategoryComboBox(), + initBeanFilterableComboBox(ui.getSortedUnsortedCategoryComboBox(), caracteristic.getQualitativeValue(), null); @@ -250,7 +249,8 @@ openDialog(dialogContent, title, new Dimension(400, 130)); - return model.getSelectedSpecies(); + Species result = model.getSelectedSpecies(); + return result; } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css 2013-03-11 10:41:20 UTC (rev 574) @@ -22,7 +22,7 @@ * #L% */ -BeanComboBox { +BeanFilterableComboBox { showReset: true; i18nPrefix: "tutti.property."; bean: {model}; 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-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx 2013-03-11 10:41:20 UTC (rev 574) @@ -36,7 +36,7 @@ org.jdesktop.swingx.JXTable - jaxx.runtime.swing.editor.bean.BeanComboBox + jaxx.runtime.swing.editor.bean.BeanFilterableComboBox jaxx.runtime.validator.swing.SwingValidatorUtil jaxx.runtime.validator.swing.SwingValidatorMessageTableModel Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java 2013-03-11 10:41:20 UTC (rev 574) @@ -37,7 +37,7 @@ import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import jaxx.runtime.swing.editor.bean.BeanComboBox; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -128,7 +128,7 @@ public void afterInitUI() { initUI(getUI()); - initBeanComboBox(getKeyCombo(), Lists.<Caracteristic>newArrayList(), null); + initBeanFilterableComboBox(getKeyCombo(), Lists.<Caracteristic>newArrayList(), null); } @@ -155,7 +155,7 @@ protected abstract M createModel(); - protected abstract BeanComboBox<Caracteristic> getKeyCombo(); + protected abstract BeanFilterableComboBox<Caracteristic> getKeyCombo(); protected abstract CaracteristicMap getCaracteristics(FishingOperation operation); @@ -167,7 +167,7 @@ /** Adds a row with the parameter selected in the combo box */ public void addRow() { - BeanComboBox<Caracteristic> keyCombo = getKeyCombo(); + BeanFilterableComboBox<Caracteristic> keyCombo = getKeyCombo(); Caracteristic selectedItem = (Caracteristic) keyCombo.getSelectedItem(); TM tableModel = getTableModel(); @@ -180,7 +180,8 @@ tableModel.fireTableRowsInserted(rowIndex, rowIndex); keyCombo.getData().remove(selectedItem); - selectFirstInCombo(keyCombo); +// selectFirstInCombo(keyCombo); + keyCombo.getHandler().reset(); M model = getModel(); model.setModify(true); @@ -235,9 +236,10 @@ } } - BeanComboBox<Caracteristic> keyCombo = getKeyCombo(); + BeanFilterableComboBox<Caracteristic> keyCombo = getKeyCombo(); keyCombo.setData(caracteristicList); - selectFirstInCombo(keyCombo); +// selectFirstInCombo(keyCombo); + keyCombo.getHandler().reset(); model.setModify(false); } @@ -256,9 +258,10 @@ } //add the row in the combo - BeanComboBox keyCombo = getKeyCombo(); + BeanFilterableComboBox keyCombo = getKeyCombo(); keyCombo.addItem(row.getKey()); - selectFirstInCombo(keyCombo); +// selectFirstInCombo(keyCombo); + keyCombo.getHandler().reset(); // remove the row from the model getModel().getRows().remove(rowIndex); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css 2013-03-11 10:41:20 UTC (rev 574) @@ -22,12 +22,12 @@ * #L% */ -BeanComboBox { +BeanFilterableComboBox { i18nPrefix: "tutti.property."; + showReset: true; } #newRowKey { - showReset: false; property: selectedCaracteristic; enabled: {!newRowKey.isEmpty()}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.jaxx 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.jaxx 2013-03-11 10:41:20 UTC (rev 574) @@ -28,7 +28,7 @@ fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI fr.ifremer.tutti.persistence.entities.referential.Caracteristic - jaxx.runtime.swing.editor.bean.BeanComboBox + jaxx.runtime.swing.editor.bean.BeanFilterableComboBox org.jdesktop.swingx.JXTable javax.swing.ListSelectionModel java.awt.Color @@ -47,8 +47,8 @@ <row fill='both'> <cell fill='both' weightx='1'> - <BeanComboBox id='newRowKey' constructorParams='this' - genericType='Caracteristic'/> + <BeanFilterableComboBox id='newRowKey' constructorParams='this' + genericType='Caracteristic'/> </cell> <cell fill='both'> <JButton id='addRow' onActionPerformed='handler.addRow()'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java 2013-03-11 10:41:20 UTC (rev 574) @@ -32,7 +32,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI; 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.swing.editor.bean.BeanFilterableComboBox; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; @@ -59,7 +59,7 @@ //------------------------------------------------------------------------// @Override - protected BeanComboBox<Caracteristic> getKeyCombo() { + protected BeanFilterableComboBox<Caracteristic> getKeyCombo() { return ui.getNewRowKey(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css 2013-03-11 10:41:20 UTC (rev 574) @@ -22,12 +22,12 @@ * #L% */ -BeanComboBox { +BeanFilterableComboBox { i18nPrefix: "tutti.property."; + showReset: true; } #newRowKey { - showReset: false; property: selectedCaracteristic; enabled: {!newRowKey.isEmpty()}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.jaxx 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.jaxx 2013-03-11 10:41:20 UTC (rev 574) @@ -28,7 +28,7 @@ fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI fr.ifremer.tutti.persistence.entities.referential.Caracteristic - jaxx.runtime.swing.editor.bean.BeanComboBox + jaxx.runtime.swing.editor.bean.BeanFilterableComboBox org.jdesktop.swingx.JXTable @@ -49,8 +49,8 @@ <row fill='both'> <cell fill='both' weightx='1'> - <BeanComboBox id='newRowKey' constructorParams='this' - genericType='Caracteristic'/> + <BeanFilterableComboBox id='newRowKey' constructorParams='this' + genericType='Caracteristic'/> </cell> <cell fill='both'> <JButton id='addRow' onActionPerformed='handler.addRow()'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java 2013-03-11 10:41:20 UTC (rev 574) @@ -32,7 +32,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI; 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.swing.editor.bean.BeanFilterableComboBox; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; @@ -59,7 +59,7 @@ //------------------------------------------------------------------------// @Override - protected BeanComboBox<Caracteristic> getKeyCombo() { + protected BeanFilterableComboBox<Caracteristic> getKeyCombo() { return ui.getNewRowKey(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2013-03-11 10:41:20 UTC (rev 574) @@ -22,7 +22,7 @@ * #L% */ -BeanComboBox { +BeanFilterableComboBox { showReset: true; i18nPrefix: "tutti.property."; bean: {model}; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx 2013-03-11 10:41:20 UTC (rev 574) @@ -31,7 +31,7 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.util.TuttiUI - jaxx.runtime.swing.editor.bean.BeanComboBox + jaxx.runtime.swing.editor.bean.BeanFilterableComboBox java.awt.Dimension javax.swing.ListSelectionModel @@ -89,8 +89,8 @@ <JLabel id='zoneLabel'/> </cell> <cell> - <BeanComboBox id='zoneComboBox' constructorParams='this' - genericType='Zone'/> + <BeanFilterableComboBox id='zoneComboBox' constructorParams='this' + genericType='Zone'/> </cell> </row> 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-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2013-03-11 10:41:20 UTC (rev 574) @@ -113,7 +113,7 @@ initUI(ui); EditProgramUIModel model = getModel(); - initBeanComboBox(ui.getZoneComboBox(), + initBeanFilterableComboBox(ui.getZoneComboBox(), persistenceService.getAllProgramZone(), model.getZone()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java 2013-03-11 10:41:20 UTC (rev 574) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -66,7 +66,8 @@ ui.getSpeciesComboBox().getData().remove(species); ui.getSpeciesComboBox().getHandler().sortData(); - handler.selectFirstInCombo(ui.getSpeciesComboBox()); +// handler.selectFirstInCombo(ui.getSpeciesComboBox()); + ui.getSpeciesComboBox().getHandler().reset(); // add new row to model (do it after combo stuff for ui best display) EditProtocolSpeciesRowModel protocol = tableModel.createNewRow(); @@ -75,7 +76,7 @@ getModel().setModify(true); - String speciesStr = getDecorator(Species.class, DecoratorService.SPECIES_BY_CRUISE_CODE).toString(species); + String speciesStr = decorate(species); sendMessage(_("tutti.flash.information.species.add.to.protocol", speciesStr)); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-03-11 10:41:20 UTC (rev 574) @@ -22,8 +22,9 @@ * #L% */ -BeanComboBox { +BeanFilterableComboBox { i18nPrefix: "tutti.property."; + showReset: true; } BeanDoubleList { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-03-11 10:41:20 UTC (rev 574) @@ -32,7 +32,7 @@ fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.util.TuttiUI - jaxx.runtime.swing.editor.bean.BeanComboBox + jaxx.runtime.swing.editor.bean.BeanFilterableComboBox jaxx.runtime.swing.editor.bean.BeanDoubleList java.awt.Dimension @@ -146,7 +146,7 @@ <row fill='both'> <cell fill='both' weightx='1'> - <BeanComboBox id='speciesComboBox' constructorParams='this' + <BeanFilterableComboBox id='speciesComboBox' constructorParams='this' genericType='Species'/> </cell> <cell fill='both'> 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-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-03-11 10:41:20 UTC (rev 574) @@ -287,7 +287,7 @@ model.getAllReferentSpeciesByTaxonId().values(); List<Species> speciesList = Lists.newArrayList(referents); - initBeanComboBox(ui.getSpeciesComboBox(), speciesList, null); + initBeanFilterableComboBox(ui.getSpeciesComboBox(), speciesList, null); List<EditProtocolSpeciesRowModel> rows; @@ -307,7 +307,8 @@ // set to model ( will propagate to tableModel) model.setRows(rows); - selectFirstInCombo(ui.getSpeciesComboBox()); +// selectFirstInCombo(ui.getSpeciesComboBox()); + ui.getSpeciesComboBox().getHandler().reset(); initDoubleList(EditProtocolUIModel.PROPERTY_LENGTH_CLASSES_PMFM_ID, ui.getLengthClassesList(), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java 2013-03-11 10:41:20 UTC (rev 574) @@ -30,7 +30,7 @@ import fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; -import jaxx.runtime.swing.editor.bean.BeanComboBox; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -104,7 +104,7 @@ model.getAllCaracteristic(), model.getAllReferentSpeciesByTaxonId()); - BeanComboBox<Species> speciesComboBox = getUI().getSpeciesComboBox(); + BeanFilterableComboBox<Species> speciesComboBox = getUI().getSpeciesComboBox(); // build rows from imported+merged protocol // (will also remove all synonyms of species referent used) @@ -113,7 +113,8 @@ // update species comboBox speciesComboBox.getHandler().sortData(); - handler.selectFirstInCombo(speciesComboBox); +// handler.selectFirstInCombo(speciesComboBox); + speciesComboBox.getHandler().reset(); // update rows in model model.setRows(rows); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java 2013-03-11 10:41:20 UTC (rev 574) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -30,7 +30,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; -import jaxx.runtime.swing.editor.bean.BeanComboBox; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import java.util.Collections; import java.util.List; @@ -63,7 +63,7 @@ // re-add all synonym of this taxon to the species comobox Species species = selectedRow.getSpecies(); - BeanComboBox<Species> combo = getUI().getSpeciesComboBox(); + BeanFilterableComboBox<Species> combo = getUI().getSpeciesComboBox(); combo.getData().add(species); combo.getHandler().sortData(); @@ -73,14 +73,14 @@ model.getAllSynonyms(String.valueOf(taxonId))); allSynonyms.remove(species); model.getAllSynonyms().addAll(allSynonyms); - // reorder the list by name, otherwise, + // reorder the list by name, otherwise, // all the species without a reftax code will be at the end Collections.sort(model.getAllSynonyms(), TuttiEntities.SPECIES_BY_NAME_COMPARATOR); // remove the row from the model(do it after treating the comboBox which can be long) tableModel.removeRow(rowIndex); - String speciesStr = getDecorator(Species.class, DecoratorService.SPECIES_BY_CRUISE_CODE).toString(selectedRow.getSpecies()); + String speciesStr = decorate(selectedRow.getSpecies()); sendMessage(_("tutti.flash.information.species.remove.from.protocol", speciesStr)); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-11 10:34:37 UTC (rev 573) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-11 10:41:20 UTC (rev 574) @@ -44,7 +44,7 @@ import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.editor.NumberEditor; -import jaxx.runtime.swing.editor.bean.BeanComboBox; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.swing.editor.bean.BeanDoubleList; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import jaxx.runtime.validator.swing.SwingValidator; @@ -94,6 +94,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import static org.nuiton.i18n.I18n._; @@ -506,23 +507,22 @@ handler.clearValidators(); } - /** * Prépare un component de choix d'entités pour un type d'entité donné et * pour un service de persistance donné. * * @param comboBox le component graphique à initialiser */ - protected <E extends Serializable> void initBeanComboBox( - BeanComboBox<E> comboBox, + protected <E extends Serializable> void initBeanFilterableComboBox( + BeanFilterableComboBox<E> comboBox, List<E> data, E selectedData) { - initBeanComboBox(comboBox, data, selectedData, null); + initBeanFilterableComboBox(comboBox, data, selectedData, null); } - protected <E extends Serializable> void initBeanComboBox( - BeanComboBox<E> comboBox, + protected <E extends Serializable> void initBeanFilterableComboBox( + BeanFilterableComboBox<E> comboBox, List<E> data, E selectedData, String decoratorContext) { @@ -716,14 +716,14 @@ AbstractTuttiBeanUIModel.PROPERTY_VALID); } - public <B> void selectFirstInCombo(BeanComboBox<B> combo) { - List<B> data = combo.getData(); - B selectedItem = null; - if (CollectionUtils.isNotEmpty(data)) { - selectedItem = data.get(0); - } - combo.setSelectedItem(selectedItem); - } +// public <B> void selectFirstInCombo(BeanFilterableComboBox<B> combo) { +// List<B> data = combo.getData(); +// B selectedItem = null; +// if (CollectionUtils.isNotEmpty(data)) { +// selectedItem = data.get(0); +// } +// combo.setSelectedItem(selectedItem); +// } protected void closeUI(TuttiUI ui) { ui.getHandler().onCloseUI();