Author: echatellier Date: 2015-05-07 13:27:52 +0000 (Thu, 07 May 2015) New Revision: 4222 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4222 Log: generics, generics everywhere... Removed: trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableTypeComboModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListModel.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoSpeciesUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierTabUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesEditorUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyOneMonthInfoUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyTabUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/vesseltype/VesselTypeUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultSimulationFrame.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/SensitivityWizardHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2015-05-07 13:27:52 UTC (rev 4222) @@ -849,7 +849,7 @@ * @param fisheryRegion fishery region * @param selectedMaps la liste de map a retirer */ - public void removeMap(FisheryRegion fisheryRegion, Object[] selectedMaps) { + public void removeMap(FisheryRegion fisheryRegion, List<String> selectedMaps) { if (log.isTraceEnabled()) { log.trace("removeMap called"); } @@ -860,8 +860,7 @@ RegionStorage regionStorage = RegionStorage.getRegion(fisheryRegion.getName()); File mapDir = regionStorage.getMapRepository(); - for (Object selectedMap : selectedMaps) { - String mapName = (String)selectedMap; + for (String mapName : selectedMaps) { maps.remove(mapName); // remove on disk too, if possible File mapFile = new File(mapDir, mapName); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2015-05-07 13:27:52 UTC (rev 4222) @@ -270,7 +270,7 @@ */ protected void refreshRegionList(InputUI inputUI, String selectedItem) { // refresh region list - GenericComboModel regionsModel = new GenericComboModel(RegionStorage.getRegionNames()); + GenericComboModel<String> regionsModel = new GenericComboModel<>(RegionStorage.getRegionNames()); inputUI.getFieldCurrentRegion().setModel(regionsModel); // event is fired by setSelectedItem to call #regionChange if (selectedItem != null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -249,6 +249,7 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="formuleComboBox" onActionPerformed='formuleChanged()' enabled='{isActive()}' + genericType="fr.ifremer.isisfish.entities.Formule" renderer="{new fr.ifremer.isisfish.ui.input.renderer.FormuleComboRenderer()}" /> </cell> </row> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellUI.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellUI.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -47,6 +47,7 @@ <row> <cell fill='horizontal' columns='2' weightx='1.0'> <JComboBox id="fieldCell" onItemStateChanged='handler.fieldCellChanged(event)' + genericType="fr.ifremer.isisfish.entities.Cell" model='{new javax.swing.DefaultComboBoxModel()}' enabled='{getBean() != null}'/> </cell> </row> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java 2015-05-07 13:27:52 UTC (rev 4222) @@ -28,6 +28,7 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.util.List; import javax.swing.DefaultListModel; @@ -88,8 +89,8 @@ } protected void setFieldMapfilesModel(FisheryRegion region) { - DefaultListModel model = new DefaultListModel(); - java.util.List<String> mapList = region.getMapFileList(); + DefaultListModel<String> model = new DefaultListModel<>(); + List<String> mapList = region.getMapFileList(); if (mapList != null) { int cnt = 0; for (String map : mapList) { @@ -106,7 +107,7 @@ } protected void delMap() { - getInputAction().removeMap(inputContentUI.getBean(), inputContentUI.fieldMapfiles.getSelectedValues()); + getInputAction().removeMap(inputContentUI.getBean(), inputContentUI.fieldMapfiles.getSelectedValuesList()); setFieldMapfilesModel(inputContentUI.getBean()); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionUI.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionUI.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -70,7 +70,7 @@ bean='{getBean()}' property='minLatitude' decorator='boxed' useSign='true'/--> <JTextField id="fieldLatMin" text='{String.valueOf(getBean().getMinLatitude())}' decorator='boxed' - onKeyReleased='getBean().setMinLatitude(Float.parseFloat(fieldLatMin.getText()))'/> + onKeyReleased='getBean().setMinLatitude(Float.parseFloat(fieldLatMin.getText()))'/> </cell> </row> <row> @@ -82,7 +82,7 @@ bean='{getBean()}' property='maxLatitude' decorator='boxed' useSign='true'/--> <JTextField id="fieldLatMax" text='{String.valueOf(getBean().getMaxLatitude())}' decorator='boxed' - onKeyReleased='getBean().setMaxLatitude(Float.parseFloat(fieldLatMax.getText()))'/> + onKeyReleased='getBean().setMaxLatitude(Float.parseFloat(fieldLatMax.getText()))'/> </cell> </row> <row> @@ -94,7 +94,7 @@ bean='{getBean()}' property='minLongitude' decorator='boxed' useSign='true'/--> <JTextField id="fieldLongMin" text='{String.valueOf(getBean().getMinLongitude())}' decorator='boxed' - onKeyReleased='getBean().setMinLongitude(Float.parseFloat(fieldLongMin.getText()))'/> + onKeyReleased='getBean().setMinLongitude(Float.parseFloat(fieldLongMin.getText()))'/> </cell> </row> <row> @@ -106,7 +106,7 @@ bean='{getBean()}' property='maxLongitude' decorator='boxed' useSign='true'/--> <JTextField id="fieldLongMax" text='{String.valueOf(getBean().getMaxLongitude())}' decorator='boxed' - onKeyReleased='getBean().setMaxLongitude(Float.parseFloat(fieldLongMax.getText()))'/> + onKeyReleased='getBean().setMaxLongitude(Float.parseFloat(fieldLongMax.getText()))'/> </cell> </row> <row> @@ -123,7 +123,7 @@ bean='{getBean()}' property='cellLengthLatitude' decorator='boxed' useSign='true'/--> <JTextField id="fieldCellLengthLatitude" text='{String.valueOf(getBean().getCellLengthLatitude())}' decorator='boxed' - onKeyReleased='getBean().setCellLengthLatitude(Float.parseFloat(fieldCellLengthLatitude.getText()))'/> + onKeyReleased='getBean().setCellLengthLatitude(Float.parseFloat(fieldCellLengthLatitude.getText()))'/> </cell> </row> <row> @@ -135,13 +135,14 @@ bean='{getBean()}' property='cellLengthLongitude' decorator='boxed' useSign='true'/--> <JTextField id="fieldCellLengthLongitude" text='{String.valueOf(getBean().getCellLengthLongitude())}' decorator='boxed' - onKeyReleased='getBean().setCellLengthLongitude(Float.parseFloat(fieldCellLengthLongitude.getText()))'/> + onKeyReleased='getBean().setCellLengthLongitude(Float.parseFloat(fieldCellLengthLongitude.getText()))'/> </cell> </row> <row> <cell columns='3' fill='both' weightx='1.0' weighty='0.6'> <JScrollPane> - <JList id="fieldMapfiles" decorator='boxed'/> + <JList id="fieldMapfiles" genericType="String" + decorator='boxed'/> </JScrollPane> </cell> </row> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityUI.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityUI.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, Code Lutin, Chatellier Eric + Copyright (C) 2009 - 2015 Ifremer, Code Lutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -158,6 +158,7 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldSelectivityPopulation" onItemStateChanged='selectivityChanged()' + genericType="fr.ifremer.isisfish.entities.Population" enabled='{isActive()}' decorator='boxed' /> </cell> </row> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoSpeciesUI.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoSpeciesUI.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, Code Lutin, Chatellier Eric + Copyright (C) 2009 - 2015 Ifremer, Code Lutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -81,7 +81,7 @@ if (getBean() != null) { metierSeasonInfo = getBean().getMetierSeasonInfo(); } - GenericComboModel<MetierSeasonInfo> seasonModel = new GenericComboModel(metierSeasonInfo); + GenericComboModel<MetierSeasonInfo> seasonModel = new GenericComboModel<>(metierSeasonInfo); fieldMetierSeasonInfo.setModel(seasonModel); } @@ -171,6 +171,7 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldMetierSeasonInfo" onItemStateChanged='metierSeasonInfoChanged()' + genericType="fr.ifremer.isisfish.entities.MetierSeasonInfo" renderer="{new fr.ifremer.isisfish.ui.input.renderer.MetierSeasonInfoComboRenderer()}" enabled='{isActive() && (isSensitivity() || !changeModel.isChanged() ) }'/> </cell> @@ -182,6 +183,7 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldTargetSpecies" onItemStateChanged='speciesChanged()' + genericType="fr.ifremer.isisfish.entities.Species" enabled='{getMetierSeasonInfo() != null}' decorator='boxed'/> </cell> </row> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneUI.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneUI.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, Code Lutin, Chatellier Eric + Copyright (C) 2009 - 2015 Ifremer, Code Lutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -213,10 +213,10 @@ } protected void metierZonesChanged() { - Object[] selected = metierZones.getSelectedValues(); + List<Zone> selected = metierZones.getSelectedValuesList(); List<Zone> zones = new ArrayList<Zone>(); - for (Object o : selected){ - zones.add((Zone)o); + for (Zone o : selected) { + zones.add(o); } getMetierSeasonInfo().setZone(zones); } @@ -239,7 +239,9 @@ <JLabel text="isisfish.metierSeasonInfoZone.selectSeason" enabled='{isActive()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="metierSeasonInfoCombo" onItemStateChanged='seasonChanged()' enabled='{isActive() && (isSensitivity() || !changeModel.isChanged() ) }' + <JComboBox id="metierSeasonInfoCombo" onItemStateChanged='seasonChanged()' + genericType="fr.ifremer.isisfish.entities.MetierSeasonInfo" + enabled='{isActive() && (isSensitivity() || !changeModel.isChanged() ) }' renderer="{new fr.ifremer.isisfish.ui.input.renderer.MetierSeasonInfoComboRenderer()}" /> </cell> </row> @@ -258,6 +260,7 @@ <cell fill='both' weightx='1.0' weighty='0.7'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> <JList id="metierZones" onValueChanged='metierZonesChanged()' + genericType="fr.ifremer.isisfish.entities.Zone" enabled='{getMetierSeasonInfo() != null}' decorator='boxed'/> </JScrollPane> </cell> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierTabUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierTabUI.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierTabUI.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -103,7 +103,8 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldMetierGear" onItemStateChanged='gearChanged()' - enabled='{isActive()}' decorator='boxed'/> + genericType="fr.ifremer.isisfish.entities.Gear" + enabled='{isActive()}' decorator='boxed'/> </cell> </row> <row> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesEditorUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesEditorUI.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesEditorUI.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, Code Lutin, Chatellier Eric + Copyright (C) 2009 - 2015 Ifremer, Code Lutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -104,7 +104,7 @@ * Change model of {@code associatedList} with all available zones, but keep * selection with {@code selectedZones}. */ -protected void setModel(List<Zone> availableZones, List<Zone> selectedZones, JList associatedList) { +protected void setModel(List<Zone> availableZones, List<Zone> selectedZones, JList<Zone> associatedList) { GenericListModel<Zone> zoneModel = new GenericListModel<>(availableZones); associatedList.setModel(zoneModel); @@ -143,12 +143,9 @@ /** * Get selected values for components as list. */ -protected List<Zone> getSelectedValues(JList component) { - Object[] selectedValues = component.getSelectedValues(); - List<Zone> selectedZone = new ArrayList<Zone>(); - for (Object value : selectedValues) { - selectedZone.add((Zone)value); - } +protected List<Zone> getSelectedValues(JList<Zone> component) { + List<Zone> selectedValues = component.getSelectedValuesList(); + List<Zone> selectedZone = new ArrayList<Zone>(selectedValues); return selectedZone; } ]]> @@ -169,17 +166,20 @@ <row> <cell fill='both' weightx='0.3' weighty='0.5'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="populationZonesPresence" onValueChanged='presenceChanged()' enabled='{isActive()}'/> + <JList id="populationZonesPresence" genericType="fr.ifremer.isisfish.entities.Zone" + onValueChanged='presenceChanged()' enabled='{isActive()}'/> </JScrollPane> </cell> <cell fill='both' weightx='0.3' weighty='0.5'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="fieldPopulationZonesReproduction" onValueChanged='reproductionChanged()' enabled='{isActive()}'/> + <JList id="fieldPopulationZonesReproduction" genericType="fr.ifremer.isisfish.entities.Zone" + onValueChanged='reproductionChanged()' enabled='{isActive()}'/> </JScrollPane> </cell> <cell fill='both' weightx='0.3' weighty='0.5'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="fieldPopulationZonesRecruitment" onValueChanged='recruitementChanged()' enabled='{isActive()}'/> + <JList id="fieldPopulationZonesRecruitment" genericType="fr.ifremer.isisfish.entities.Zone" + onValueChanged='recruitementChanged()' enabled='{isActive()}'/> </JScrollPane> </cell> </row> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionUI.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionUI.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, Code Lutin, Chatellier Eric + Copyright (C) 2009 - 2015 Ifremer, Code Lutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -95,24 +95,22 @@ protected void setEffortDescriptionEffortDescriptionList() { GenericListModel<EffortDescription> model = new GenericListModel<>(); if (getBean() != null && getBean().getPossibleMetiers() != null) { - List<EffortDescription> effortDescriptions = new ArrayList<EffortDescription>(getBean().getPossibleMetiers()); + List<EffortDescription> effortDescriptions = new ArrayList<>(getBean().getPossibleMetiers()); model.setElementList(effortDescriptions); } fieldEffortDescriptionEffortDescriptionList.setModel(model); } protected void addEffortDescriptions() { - Object[] selectedValues = (Object[])fieldEffortDescriptionMetierList.getSelectedValues(); - for (Object selectedValue : selectedValues) { - Metier selectedMetier = (Metier)selectedValue; + List<Metier> selectedValues = fieldEffortDescriptionMetierList.getSelectedValuesList(); + for (Metier selectedMetier : selectedValues) { getInputAction().addEffortDescription(getBean(), selectedMetier); } setEffortDescriptionEffortDescriptionList(); } protected void removeEffortDescriptions() { - Object[] selectedValues = (Object[])fieldEffortDescriptionEffortDescriptionList.getSelectedValues(); - for (Object selectedValue : selectedValues) { - EffortDescription selectedEffortDescription = (EffortDescription)selectedValue; + List<EffortDescription> selectedValues = fieldEffortDescriptionEffortDescriptionList.getSelectedValuesList(); + for (EffortDescription selectedEffortDescription : selectedValues) { getInputAction().removeEffortDescription(getBean(), selectedEffortDescription); } setEffortDescriptionEffortDescriptionList(); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyOneMonthInfoUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyOneMonthInfoUI.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyOneMonthInfoUI.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, Code Lutin, Chatellier Eric + Copyright (C) 2009 - 2015 Ifremer, Code Lutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -86,6 +86,7 @@ <row> <cell columns='2' fill='horizontal' weightx='1.0'> <JComboBox id="fieldStrategyMonthInfoTripType" + genericType="fr.ifremer.isisfish.entities.TripType" onActionPerformed='getStrategyMonthInfo().setTripType((TripType)fieldStrategyMonthInfoTripType.getSelectedItem())' renderer='{new fr.ifremer.isisfish.ui.input.renderer.TripTypeListRenderer(true)}' enabled='{isActive()}' decorator='boxed'/> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyTabUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyTabUI.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyTabUI.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -121,6 +121,7 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldStrategySetOfVessels" + genericType="fr.ifremer.isisfish.entities.SetOfVessels" onItemStateChanged='setOfVesselsChanged()' enabled='{isActive()}' decorator='boxed'/> </cell> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java 2015-05-07 13:27:52 UTC (rev 4222) @@ -129,7 +129,7 @@ * @param view view */ public void deleteVariable(EntityVariableUI view) { - JList variableList = view.getVariablesList(); + JList<Variable> variableList = view.getVariablesList(); Variable variable = (Variable)variableList.getSelectedValue(); try { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2012 Ifremer, Code Lutin, Chatellier Eric + Copyright (C) 2012 - 2015 Ifremer, Code Lutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -25,6 +25,7 @@ <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='org.nuiton.topia.persistence.TopiaEntityContextable'> <import> static org.nuiton.i18n.I18n.t + fr.ifremer.isisfish.ui.models.common.GenericComboModel </import> <EntityVariableHandler id="varHandler" /> @@ -107,7 +108,8 @@ enabled='{isActive() && getVariable() != null}'/> </cell> <cell fill="horizontal" weightx='1.0'> - <JComboBox id="variableTypeCombo" model="{new VariableTypeComboModel()}" + <JComboBox id="variableTypeCombo" model="{new GenericComboModel<fr.ifremer.isisfish.entities.Variable>()}" + genericType="fr.ifremer.isisfish.entities.Variable" selectedItem="{getVariable().getType()}" onActionPerformed="getVarHandler().showSelectedType(this)" enabled='{isActive() && getVariable() != null}' decorator='boxed' /> Deleted: trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableTypeComboModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableTypeComboModel.java 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableTypeComboModel.java 2015-05-07 13:27:52 UTC (rev 4222) @@ -1,76 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 Ifremer, CodeLutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package fr.ifremer.isisfish.ui.input.variable; - -import javax.swing.DefaultComboBoxModel; - -import fr.ifremer.isisfish.entities.VariableType; - -/** - * Modele pour la liste des type possible de variable. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class VariableTypeComboModel extends DefaultComboBoxModel<VariableType> { - - /** serialVersionUID. */ - private static final long serialVersionUID = 6171850179969290032L; - - /** Values list */ - protected VariableType[] variableTypes; - - /** - * Empty constructor. - */ - public VariableTypeComboModel() { - variableTypes = VariableType.values(); - } - - /* - * @see javax.swing.ListModel#getElementAt(int) - */ - @Override - public VariableType getElementAt(int index) { - return variableTypes[index]; - } - - /* - * @see javax.swing.ListModel#getSize() - */ - @Override - public int getSize() { - int size = 0; - - if (variableTypes != null) { - size = variableTypes.length; - } - return size; - } -} Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/vesseltype/VesselTypeUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/vesseltype/VesselTypeUI.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/vesseltype/VesselTypeUI.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, Code Lutin, Chatellier Eric + Copyright (C) 2009 - 2015 Ifremer, Code Lutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -109,10 +109,7 @@ } protected void tripTypeChanged() { if (!init) { - java.util.List<TripType> tripTypes = new java.util.ArrayList<TripType>(); - for (Object o : vesselTypeTripType.getSelectedValues()) { - tripTypes.add((TripType)o); - } + List<TripType> tripTypes = new ArrayList<TripType>(vesselTypeTripType.getSelectedValuesList()); getBean().setTripType(tripTypes); } } @@ -218,6 +215,7 @@ <cell fill='both' weightx='1.0' weighty='0.7'> <JScrollPane> <JList id="vesselTypeTripType" onValueChanged='tripTypeChanged()' + genericType="fr.ifremer.isisfish.entities.TripType" cellRenderer="{new fr.ifremer.isisfish.ui.input.renderer.TripTypeListRenderer()}" enabled='{isActive()}' decorator='boxed' _sensitivityBean='{VesselType.class}' _sensitivityMethod='"TripType"'/> </JScrollPane> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsUI.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsUI.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Chatellier Eric + Copyright (C) 2009 - 2015 Ifremer, Code Lutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -98,9 +98,9 @@ if (event.getValueIsAdjusting()) { // pas a faie dans le cas d'une AS if (isActive()) { - java.util.List<Cell> cells = new ArrayList<Cell>(); - for (Object o : zoneCells.getSelectedValues()) { - cells.add((Cell) o); + List<Cell> cells = new ArrayList<Cell>(); + for (Cell o : zoneCells.getSelectedValuesList()) { + cells.add(o); } getBean().setCell(cells); } @@ -133,6 +133,7 @@ <cell columns='2' fill='both' weighty='0.7' weightx='1.0'> <JScrollPane id="spZoneCells"> <JList id="zoneCells" enabled='{isActive()}' + genericType="fr.ifremer.isisfish.entities.Cell" onValueChanged='zoneCellsChange(event)' decorator='boxed'/> </JScrollPane> </cell> Deleted: trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboModel.java 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboModel.java 2015-05-07 13:27:52 UTC (rev 4222) @@ -1,109 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2011 Ifremer, Code Lutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package fr.ifremer.isisfish.ui.models.sensitivityanalysis; - -import java.util.List; - -import javax.swing.DefaultComboBoxModel; - -/** - * Model pour la liste des calculateurs de sensibilite. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class SensitivityAnalysisComboModel extends DefaultComboBoxModel<String> { - - /** serialVersionUID. */ - private static final long serialVersionUID = -4070846632975105788L; - - /** SensitivityAnalysis names. */ - protected List<String> sensitivityAnalysisNames; - - /** - * Empty constructor. - */ - public SensitivityAnalysisComboModel() { - this(null); - } - - /** - * Constructor with calculator list. - * - * @param sensitivityAnalysisNames sensitivity analysis Names - */ - public SensitivityAnalysisComboModel(List<String> sensitivityAnalysisNames) { - setSensitivityCalculatorNames(sensitivityAnalysisNames); - } - - /** - * Get sensitivity analysis plan names. - * - * @return the sensitivity analysis plan names - */ - public List<String> getSensitivityAnalysisNames() { - return sensitivityAnalysisNames; - } - - /** - * Set sensitivity analysis names. - * - * @param sensitivityAnalysisNames the names to set - */ - public void setSensitivityCalculatorNames(List<String> sensitivityAnalysisNames) { - this.sensitivityAnalysisNames = sensitivityAnalysisNames; - - // default first selected - /* disable default selection - if (!sensitivityAnalysisNames.isEmpty()) { - setSelectedItem(sensitivityAnalysisNames.get(0)); - }*/ - } - - /* - * @see javax.swing.ListModel#getElementAt(int) - */ - @Override - public String getElementAt(int index) { - return sensitivityAnalysisNames.get(index); - } - - /* - * @see javax.swing.ListModel#getSize() - */ - @Override - public int getSize() { - int size = 0; - - if (sensitivityAnalysisNames != null) { - size = sensitivityAnalysisNames.size(); - } - return size; - } -} Deleted: trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListModel.java 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListModel.java 2015-05-07 13:27:52 UTC (rev 4222) @@ -1,104 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 Ifremer, Code Lutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package fr.ifremer.isisfish.ui.models.sensitivityanalysis; - -import java.util.List; - -import javax.swing.AbstractListModel; - -import fr.ifremer.isisfish.simulator.sensitivity.SensitivityAnalysis; - -/** - * Model pour la liste des instances de calculateurs. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class SensitivityAnalysisListModel extends AbstractListModel<SensitivityAnalysis> { - - /** serialVersionUID. */ - private static final long serialVersionUID = -4070846632975105788L; - - protected List<SensitivityAnalysis> sensitivityAnalysis; - - /** - * Empty constructor. - */ - public SensitivityAnalysisListModel() { - this(null); - } - - /** - * Constructor with list. - * - * @param sensitivityAnalysis analysis list - */ - public SensitivityAnalysisListModel(List<SensitivityAnalysis> sensitivityAnalysis) { - setSensitivityAnalysis(sensitivityAnalysis); - } - - /** - * Get analysis list. - * - * @return the analysis - */ - public List<SensitivityAnalysis> getSensitivityAnalysis() { - return sensitivityAnalysis; - } - - /** - * Set analysis list. - * - * @param sensitivityAnalysis the analysis to set - */ - public void setSensitivityAnalysis(List<SensitivityAnalysis> sensitivityAnalysis) { - this.sensitivityAnalysis = sensitivityAnalysis; - } - - /* - * @see javax.swing.ListModel#getElementAt(int) - */ - @Override - public SensitivityAnalysis getElementAt(int index) { - return sensitivityAnalysis.get(index); - } - - /* - * @see javax.swing.ListModel#getSize() - */ - @Override - public int getSize() { - int size = 0; - - if (sensitivityAnalysis != null) { - size = sensitivityAnalysis.size(); - } - return size; - } -} Deleted: trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListModel.java 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListModel.java 2015-05-07 13:27:52 UTC (rev 4222) @@ -1,105 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 Ifremer, Code Lutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package fr.ifremer.isisfish.ui.models.sensitivityexport; - -import java.util.List; - -import javax.swing.AbstractListModel; - -import fr.ifremer.isisfish.export.SensitivityExport; - -/** - * Model pour la liste des instances d'exports. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class SensitivityExportListModel extends AbstractListModel<SensitivityExport> { - - /** serialVersionUID. */ - private static final long serialVersionUID = -4070846632975105788L; - - protected List<SensitivityExport> exports; - - /** - * Empty constructor. - */ - public SensitivityExportListModel() { - this(null); - } - - /** - * Constructor with plan list. - * - * @param exports exports - */ - public SensitivityExportListModel(List<SensitivityExport> exports) { - super(); - setSensitivityExports(exports); - } - - /** - * Get exports list. - * - * @return the exports - */ - public List<SensitivityExport> getSensitivityExports() { - return exports; - } - - /** - * Set exports list. - * - * @param exports the exports to set - */ - public void setSensitivityExports(List<SensitivityExport> exports) { - this.exports = exports; - } - - /* - * @see javax.swing.ListModel#getElementAt(int) - */ - @Override - public SensitivityExport getElementAt(int index) { - return exports.get(index); - } - - /* - * @see javax.swing.ListModel#getSize() - */ - @Override - public int getSize() { - int size = 0; - - if (exports != null) { - size = exports.size(); - } - return size; - } -} Deleted: trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboModel.java 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboModel.java 2015-05-07 13:27:52 UTC (rev 4222) @@ -1,108 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2011 Ifremer, Code Lutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package fr.ifremer.isisfish.ui.models.simulationplan; - -import java.util.List; - -import javax.swing.DefaultComboBoxModel; - -/** - * Model pour la liste des plans de simulation. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class SimulationPlanComboModel extends DefaultComboBoxModel<String> { - - /** serialVersionUID. */ - private static final long serialVersionUID = -4070846632975105788L; - - /** Analyze plan names. */ - protected List<String> simulationPlanNames; - - /** - * Empty constructor. - */ - public SimulationPlanComboModel() { - this(null); - } - - /** - * Constructor with simulation plans list. - * - * @param simulationPlanNames simulation names - */ - public SimulationPlanComboModel(List<String> simulationPlanNames) { - setSimulationPlanNames(simulationPlanNames); - } - - /** - * Get simulation plan names. - * - * @return the simulation plan names - */ - public List<String> getSimulationPlanNames() { - return simulationPlanNames; - } - - /** - * Set simulation plan names. - * - * @param simulationPlanNames the simulation plan names to set - */ - public void setSimulationPlanNames(List<String> simulationPlanNames) { - this.simulationPlanNames = simulationPlanNames; - - // default first selected - if (!simulationPlanNames.isEmpty()) { - setSelectedItem(simulationPlanNames.get(0)); - } - } - - /* - * @see javax.swing.ListModel#getElementAt(int) - */ - @Override - public String getElementAt(int index) { - return simulationPlanNames.get(index); - } - - /* - * @see javax.swing.ListModel#getSize() - */ - @Override - public int getSize() { - int size = 0; - - if (simulationPlanNames != null) { - size = simulationPlanNames.size(); - } - return size; - } -} Deleted: trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListModel.java 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListModel.java 2015-05-07 13:27:52 UTC (rev 4222) @@ -1,104 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2011 Ifremer, Code Lutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package fr.ifremer.isisfish.ui.models.simulationplan; - -import java.util.List; - -import javax.swing.AbstractListModel; - -import fr.ifremer.isisfish.simulator.SimulationPlan; - -/** - * Model pour la liste des instances de plans de simulation. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class SimulationPlanListModel extends AbstractListModel<SimulationPlan> { - - /** serialVersionUID. */ - private static final long serialVersionUID = -4070846632975105788L; - - protected List<SimulationPlan> plans; - - /** - * Empty constructor. - */ - public SimulationPlanListModel() { - this(null); - } - - /** - * Constructor with plan list. - * - * @param plans plans - */ - public SimulationPlanListModel(List<SimulationPlan> plans) { - setSimulationPlan(plans); - } - - /** - * Get plans list. - * - * @return the plans - */ - public List<SimulationPlan> getSimulationPlans() { - return plans; - } - - /** - * Set plans list. - * - * @param plans the plans to set - */ - public void setSimulationPlan(List<SimulationPlan> plans) { - this.plans = plans; - } - - /* - * @see javax.swing.ListModel#getElementAt(int) - */ - @Override - public SimulationPlan getElementAt(int index) { - return plans.get(index); - } - - /* - * @see javax.swing.ListModel#getSize() - */ - @Override - public int getSize() { - int size = 0; - - if (plans != null) { - size = plans.size(); - } - return size; - } -} Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2015-05-07 13:27:52 UTC (rev 4222) @@ -202,7 +202,7 @@ matrixViewerPanel.addMatrixFilter(new SumByYearMatrixFilter()); // init available results list - GenericComboModel<String> model = new GenericComboModel<String>(resultStorage.getResultName()); + GenericComboModel<String> model = new GenericComboModel<>(resultStorage.getResultName()); resultSimulationFrame.getResultsComboBox().setModel(model); resultSimulationFrame.getResultsComboBox().addItemListener(new ItemListener() { @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultSimulationFrame.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultSimulationFrame.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultSimulationFrame.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -47,7 +47,9 @@ <Table> <row> <cell><JLabel text="isisfish.result.selectResult" /></cell> - <cell fill="horizontal" weightx="1"><JComboBox id="resultsComboBox" /></cell> + <cell fill="horizontal" weightx="1"> + <JComboBox id="resultsComboBox" genericType="String" /> + </cell> </row> <row> <cell fill="both" weightx="1" weighty="1" columns="2"> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java 2015-05-07 13:27:52 UTC (rev 4222) @@ -41,7 +41,7 @@ * Last update : $Date$ * By : $Author$ */ -public class ScriptTypesComboModel extends DefaultComboBoxModel { +public class ScriptTypesComboModel extends DefaultComboBoxModel<ScriptMapping> { /** serialVersionUID. */ private static final long serialVersionUID = -4070846632975105788L; @@ -71,7 +71,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public ScriptMapping getElementAt(int index) { return mappings.get(index); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2014 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2015 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -38,10 +38,9 @@ fr.ifremer.isisfish.simulator.sensitivity.SensitivityAnalysis fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain fr.ifremer.isisfish.ui.models.common.GenericListModel - fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListModel + fr.ifremer.isisfish.ui.models.common.GenericComboModel fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListRenderer fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportNameListRenderer - fr.ifremer.isisfish.ui.models.sensitivityanalysis.SensitivityAnalysisComboModel fr.ifremer.isisfish.ui.models.sensitivityanalysis.SensitivityAnalysisComboRenderer fr.ifremer.isisfish.ui.models.common.ScriptParametersTableCellEditor fr.ifremer.isisfish.ui.models.common.ScriptParametersTableCellRenderer @@ -79,7 +78,7 @@ public ComboBoxModel<String> getSensitivityAnalysisModel() { List<String> sensitivityNames = getSimulAction().getSensitivityAnalysisNames(); - SensitivityAnalysisComboModel model = new SensitivityAnalysisComboModel(sensitivityNames); + GenericComboModel<String> model = new GenericComboModel<>(sensitivityNames); return model; } @@ -151,7 +150,7 @@ protected GenericListModel<String> getAvailableExportListModel() { List<String> exportNames = getSimulAction().getSensitivityExportNames(); - GenericListModel<String> model = new GenericListModel<String>(exportNames); + GenericListModel<String> model = new GenericListModel<>(exportNames); return model; } @@ -161,9 +160,9 @@ * Export name can be duplicated. */ protected void addExports() { - Object[] exportNames = (Object[])availableSensitivityExports.getSelectedValues(); - for (Object exportName : exportNames) { - getSimulAction().addSensitivityExport(this, (String)exportName); + List<String> exportNames = availableSensitivityExports.getSelectedValuesList(); + for (String exportName : exportNames) { + getSimulAction().addSensitivityExport(this, exportName); } setSensitivityExportListModel(); } @@ -172,9 +171,9 @@ * Remove multiple export. */ protected void removeExports() { - Object[] exports = (Object[])selectedSensitivityExports.getSelectedValues(); - for (Object export : exports) { - getSimulAction().removeSensitivityExport((SensitivityExport)export); + List<SensitivityExport> exports = selectedSensitivityExports.getSelectedValuesList(); + for (SensitivityExport export : exports) { + getSimulAction().removeSensitivityExport(export); } setSensitivityExportListModel(); } @@ -191,8 +190,8 @@ * Set model (refresh export JList). */ public void setSensitivityExportListModel() { - java.util.List<SensitivityExport> exports = getSimulAction().getSensitivityExports(); - SensitivityExportListModel model = new SensitivityExportListModel(exports); + List<SensitivityExport> exports = getSimulAction().getSensitivityExports(); + GenericListModel<SensitivityExport> model = new GenericListModel<>(exports); selectedSensitivityExports.setModel(model); selectedSensitivityExports.setCellRenderer(new SensitivityExportListRenderer()); @@ -243,6 +242,7 @@ </cell> <cell fill="horizontal" weightx="1.0"> <JComboBox id="fieldSensitivityAnalysisSelect" model='{getSensitivityAnalysisModel()}' + genericType="String" renderer='{new SensitivityAnalysisComboRenderer()}' onActionPerformed='sensitivityAnalysisChanged()'/> </cell> </row> @@ -277,6 +277,7 @@ <JScrollPane> <JList id="availableSensitivityExports" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" model='{getAvailableExportListModel()}' cellRenderer='{new SensitivityExportNameListRenderer()}' + genericType="String" onValueChanged='availableSensitivityExportSelection()' /> </JScrollPane> </cell> @@ -302,6 +303,7 @@ <cell fill="both" weightx="0.5" weighty="1.0"> <JScrollPane> <JList id="selectedSensitivityExports" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" + genericType="fr.ifremer.isisfish.export.SensitivityExport" onValueChanged='selectedSensitivityExportSelection()' /> </JScrollPane> </cell> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2014 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2015 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -84,7 +84,7 @@ } } - GenericComboModel<String> model = new GenericComboModel<String>(asNames); + GenericComboModel<String> model = new GenericComboModel<>(asNames); return model; } @@ -104,7 +104,7 @@ try { String selectedSimulationName = (String)fieldSensitivitySimulationSelect.getSelectedItem(); - java.util.List<File> files = getSimulAction().getSensitivitySecondPassResults(selectedSimulationName); + List<File> files = getSimulAction().getSensitivitySecondPassResults(selectedSimulationName); String content = ""; for(File file : files) { @@ -114,8 +114,7 @@ content += "\n"; } textAreaSensitivitySecondpassResult.setText(content); - } - catch(IOException e) { + } catch(IOException e) { if (log.isErrorEnabled()) { log.error("Can't run second pass", e); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/SensitivityWizardHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/SensitivityWizardHandler.java 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/SensitivityWizardHandler.java 2015-05-07 13:27:52 UTC (rev 4222) @@ -301,7 +301,7 @@ try { context = regionStorage.getStorage().beginTransaction(); List list = context.findAll("from " + value.getClass().getName()); - JComboBox c = new JComboBox(list.toArray()); + JComboBox c = new JComboBox<>(list.toArray()); c.setSelectedItem(value); result = c; } catch (TopiaException ex) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2014 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2015 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -142,13 +142,17 @@ <JLabel text="isisfish.advancedParams.simulatorUse"/> </cell> <cell columns="4" fill="horizontal"> - <JComboBox id="fieldSimulAdvParamsSimulatorSelect" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getSimulatorNames().toArray())}' + <JComboBox id="fieldSimulAdvParamsSimulatorSelect" + genericType="String" + model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getSimulatorNames().toArray())}' onActionPerformed='setSimulatorName()'/> </cell> </row> <row> <cell columns="2" fill="horizontal"> - <JCheckBox id="fieldSimulationStatistique" text="isisfish.advancedParams.simulationStatistique" selected='{getContextValue(SimulAction.class).getSimulationParameter().getUseStatistic()}' + <JCheckBox id="fieldSimulationStatistique" + text="isisfish.advancedParams.simulationStatistique" + selected='{getContextValue(SimulAction.class).getSimulationParameter().getUseStatistic()}' onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setUseStatistic(fieldSimulationStatistique.isSelected());'/> </cell> <cell columns="2" fill="horizontal"> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2005 - 2014 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2005 - 2015 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -66,10 +66,10 @@ protected void saveSimulationExports(ListSelectionEvent event) { // Set exports (this can save empty list (not a big deal)) - Object[] values = listSimulExportChoose.getSelectedValues(); - java.util.List<String> exportNames = new LinkedList<String>(); - for (Object o : values) { - exportNames.add((String) o); + List<String> values = listSimulExportChoose.getSelectedValuesList(); + List<String> exportNames = new LinkedList<>(); + for (String o : values) { + exportNames.add(o); } getSimulAction().getSimulationParameter().setExportNames(exportNames); @@ -80,10 +80,10 @@ protected void saveConfigExports() { // Set exports (this can save empty list (not a big deal)) - Object[] values = listSimulExportChoose.getSelectedValues(); - java.util.List<String> exportNames = new LinkedList<String>(); - for (Object o : values) { - exportNames.add((String) o); + List<String> values = listSimulExportChoose.getSelectedValuesList(); + List<String> exportNames = new LinkedList<String>(); + for (String o : values) { + exportNames.add(o); } getSimulAction().getSimulationParameter().setExportNames(exportNames); @@ -102,6 +102,7 @@ <cell fill="both" weightx="1.0" weighty="1.0"> <JScrollPane> <JList id="listSimulExportChoose" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" + genericType="String" cellRenderer='{new fr.ifremer.isisfish.ui.models.export.ExportNameListRenderer()}' onValueChanged='saveSimulationExports(event)' /> </JScrollPane> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2013 - 2014 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2013 - 2015 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2005 - 2014 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2005 - 2015 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -82,7 +82,7 @@ @Override public void simulationStop(SimulationService simService, final SimulationJob job) { - final GenericComboModel<String> model = (GenericComboModel)fieldSimulParamsSelect.getModel(); + final GenericComboModel<String> model = (GenericComboModel<String>)fieldSimulParamsSelect.getModel(); SwingUtilities.invokeLater(new Runnable() { public void run() { model.addElement(job.getId()); @@ -294,7 +294,7 @@ } protected void strategySelected(){ - simulAction.setStrategies(listSimulParamsStrategies.getSelectedValues()); + simulAction.setStrategies(listSimulParamsStrategies.getSelectedValuesList()); } protected ComboBoxModel<String> getSimulParamsSelectModel() { @@ -322,6 +322,7 @@ </cell> <cell fill="horizontal" weightx="1.0"> <FilterableComboBox id="fieldSimulParamsSelect" + genericType="String" model='{getSimulParamsSelectModel()}' onActionPerformed='loadOldSimulation()' /> </cell> @@ -434,6 +435,7 @@ weighty="1"> <JScrollPane> <JList id="listSimulParamsStrategies" + genericType="fr.ifremer.isisfish.entities.Strategy" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" selectionModel="{new jaxx.runtime.swing.OneClicListSelectionModel(listSimulParamsStrategies.getSelectionModel(), listSimulParamsStrategies.getModel())}" onValueChanged='strategySelected()' @@ -444,6 +446,7 @@ weighty="1"> <JScrollPane> <JList id="listSimulParamsPopulations" + genericType="fr.ifremer.isisfish.entities.Population" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" selectionModel="{new jaxx.runtime.swing.OneClicListSelectionModel(listSimulParamsPopulations.getSelectionModel(), listSimulParamsPopulations.getModel())}" onValueChanged='simulAction.populationSelected(this)' @@ -541,6 +544,7 @@ </cell> <cell fill="horizontal" weightx="0.4"> <JComboBox id="comboSelLauncher" + genericType="fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher" model='{new DefaultComboBoxModel(simulAction.getSimulationLauncher().toArray())}' /> </cell> <cell fill="horizontal" weightx="0.4"> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2005 - 2014 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2005 - 2015 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -54,7 +54,7 @@ // userResults = intersection(userResults,availableResult) userResults.retainAll(availableResults); - GenericListModel<String> resultModel = new GenericListModel<String>(availableResults); + GenericListModel<String> resultModel = new GenericListModel<>(availableResults); listResultNames.setModel(resultModel); for (String userResult : userResults) { @@ -64,11 +64,11 @@ } protected void saveParametersResultNames(ListSelectionEvent event) { - getContextValue(SimulAction.class).saveParametersResultNames(listResultNames.getSelectedValues()); + getContextValue(SimulAction.class).saveParametersResultNames(listResultNames.getSelectedValuesList()); } protected void saveConfigResultNames() { - getContextValue(SimulAction.class).saveConfigurationResultNames(listResultNames.getSelectedValues()); + getContextValue(SimulAction.class).saveConfigurationResultNames(listResultNames.getSelectedValuesList()); setStatusMessage(t("isisfish.resultChoice.saved")); } @@ -82,6 +82,7 @@ <JLabel text="isisfish.resultChoice.save" horizontalAlignment="center" constraints='BorderLayout.NORTH'/> <JScrollPane constraints='BorderLayout.CENTER'> <JList id="listResultNames" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" + genericType="String" cellRenderer='{new fr.ifremer.isisfish.ui.models.result.ResultListRenderer()}' onValueChanged='saveParametersResultNames(event)' /> </JScrollPane> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2015-05-07 13:27:52 UTC (rev 4222) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2005 - 2011 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2005 - 2015 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -25,19 +25,19 @@ <Table> <import> java.awt.Dimension - javax.swing.table.DefaultTableModel; - fr.ifremer.isisfish.datastore.SimulationPlanStorage; - fr.ifremer.isisfish.datastore.StorageChangeEvent; - fr.ifremer.isisfish.datastore.StorageChangeListener; - fr.ifremer.isisfish.simulator.SimulationPlan; - fr.ifremer.isisfish.ui.models.simulationplan.SimulationPlanComboModel; - fr.ifremer.isisfish.ui.models.simulationplan.SimulationPlanComboRenderer; - fr.ifremer.isisfish.ui.models.simulationplan.SimulationPlanListModel; - fr.ifremer.isisfish.ui.models.simulationplan.SimulationPlanListRenderer; - fr.ifremer.isisfish.ui.models.common.ScriptParametersTableModel; - fr.ifremer.isisfish.ui.models.common.ScriptParametersTableCellEditor; - fr.ifremer.isisfish.ui.models.common.ScriptParametersTableCellRenderer; - fr.ifremer.isisfish.datastore.RegionStorage; + javax.swing.table.DefaultTableModel + fr.ifremer.isisfish.datastore.SimulationPlanStorage + fr.ifremer.isisfish.datastore.StorageChangeEvent + fr.ifremer.isisfish.datastore.StorageChangeListener + fr.ifremer.isisfish.simulator.SimulationPlan + fr.ifremer.isisfish.ui.models.common.GenericComboModel + fr.ifremer.isisfish.ui.models.simulationplan.SimulationPlanComboRenderer + fr.ifremer.isisfish.ui.models.common.GenericListModel + fr.ifremer.isisfish.ui.models.simulationplan.SimulationPlanListRenderer + fr.ifremer.isisfish.ui.models.common.ScriptParametersTableModel + fr.ifremer.isisfish.ui.models.common.ScriptParametersTableCellEditor + fr.ifremer.isisfish.ui.models.common.ScriptParametersTableCellRenderer + fr.ifremer.isisfish.datastore.RegionStorage </import> <SimulAction id='simulAction' javaBean='getContextValue(SimulAction.class)' /> @@ -66,18 +66,18 @@ /** * Refresh simulation plan names list. */ - protected SimulationPlanComboModel getSimulationPlansComboModel() { + protected GenericComboModel<String> getSimulationPlansComboModel() { List<String> simulationPlanNames = simulAction.getSimulationPlanNames(); - SimulationPlanComboModel model = new SimulationPlanComboModel(simulationPlanNames); + GenericComboModel<String> model = new GenericComboModel<>(simulationPlanNames); return model; } /** * Refresh simulation simulation plan list. */ - protected SimulationPlanListModel getSimulationSimulationPlansListModel() { + protected GenericListModel<SimulationPlan> getSimulationSimulationPlansListModel() { List<SimulationPlan> simulationPlans = simulAction.getParamSimulationPlans(); - SimulationPlanListModel model = new SimulationPlanListModel(simulationPlans); + GenericListModel<SimulationPlan> model = new GenericListModel<>(simulationPlans); return model; } @@ -105,12 +105,10 @@ if (getContextValue(SimulAction.class).getParamSimulationPlans().isEmpty()) { buttonSimulParamsSimulationPlansClear.setEnabled(false); buttonSimulParamsSimulationPlansRemove.setEnabled(false); - } - else { + } else { if (listSimulParamsSimulationPlansList.getSelectedIndex() != -1) { buttonSimulParamsSimulationPlansRemove.setEnabled(true); - } - else { + } else { buttonSimulParamsSimulationPlansRemove.setEnabled(false); } buttonSimulParamsSimulationPlansClear.setEnabled(true); @@ -127,8 +125,7 @@ cellEditor.setRegionStorage(getContextValue(RegionStorage.class)); simulParamsSimulationPlans.getColumnModel().getColumn(0).setCellRenderer(new ScriptParametersTableCellRenderer(selectedSimulationPlan)); simulParamsSimulationPlans.getColumnModel().getColumn(1).setCellEditor(cellEditor); - } - else { + } else { // clear table simulParamsSimulationPlans.setModel(new DefaultTableModel()); } @@ -138,6 +135,7 @@ <row> <cell columns="2" fill="horizontal" weightx="1.0"> <JComboBox id="fieldSimulParamsSimulationPlansSelect" model='{getSimulationPlansComboModel()}' + genericType="String" renderer='{new SimulationPlanComboRenderer()}' /> </cell> </row> @@ -145,6 +143,7 @@ <cell fill="both" weightx="0.5"> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> <JList id="listSimulParamsSimulationPlansList" selectionMode="{javax.swing.ListSelectionModel.SINGLE_SELECTION}" + genericType="fr.ifremer.isisfish.simulator.SimulationPlan" onValueChanged='setSimulationPlanButtons()' model='{getSimulationSimulationPlansListModel()}' cellRenderer='{new SimulationPlanListRenderer()}'/> </JScrollPane> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2015-05-07 09:51:50 UTC (rev 4221) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2015-05-07 13:27:52 UTC (rev 4222) @@ -25,6 +25,13 @@ package fr.ifremer.isisfish.ui.simulator; +import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.DOT; +import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.NUMBER_KEY; +import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.PARAMETERS_KEY; +import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.PARAMETER_KEY; +import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.POPULATION_KEY; +import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.RULES_KEY; +import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.RULE_KEY; import static org.nuiton.i18n.I18n.t; import java.awt.BorderLayout; @@ -37,6 +44,8 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Properties; @@ -51,10 +60,8 @@ import javax.swing.JComponent; import javax.swing.JPanel; -import jaxx.runtime.SwingUtil; - +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; @@ -99,17 +106,8 @@ import fr.ifremer.isisfish.ui.sensitivity.wizard.SensitivityWizardHandler; import fr.ifremer.isisfish.ui.util.ErrorHelper; import fr.ifremer.isisfish.ui.widget.editor.ScriptParameterDialog; -import java.util.HashMap; -import java.util.LinkedHashMap; +import jaxx.runtime.SwingUtil; -import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.DOT; -import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.NUMBER_KEY; -import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.PARAMETER_KEY; -import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.PARAMETERS_KEY; -import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.POPULATION_KEY; -import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.RULES_KEY; -import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.RULE_KEY; - /** * SimulAction. * @@ -350,6 +348,7 @@ /** * Recursive rename and delete rule factor path. * + * @param factorGroup factorGroup * @param ruleIndex rule index to to delete */ protected void preRemoveRule(FactorGroup factorGroup, int ruleIndex) { @@ -411,11 +410,8 @@ * * @param strategies */ - public void setStrategies(Object[] strategies) { - List<Strategy> result = new ArrayList<Strategy>(); - for (Object o : strategies) { - result.add((Strategy) o); - } + public void setStrategies(List<Strategy> strategies) { + List<Strategy> result = new ArrayList<Strategy>(strategies); param.setStrategies(result); } @@ -458,11 +454,8 @@ * * @param populations populations to set */ - public void setPopulations(Object[] populations) { - List<Population> result = new ArrayList<Population>(); - for (Object o : populations) { - result.add((Population) o); - } + public void setPopulations(List<Population> populations) { + List<Population> result = new ArrayList<Population>(populations); param.setPopulations(result); } @@ -599,11 +592,8 @@ */ public List<String> getExportNames() { - List<String> result = new ArrayList<String>(); List<String> exportNames = ExportStorage.getExportNames(); - for (String export : exportNames) { - result.add(export); - } + List<String> result = new ArrayList<String>(exportNames); return result; } @@ -626,11 +616,8 @@ * ResultUI */ - public void saveParametersResultNames(Object[] resultNames) { - List<String> resultNamesString = new ArrayList<String>(); - for (Object o : resultNames) { - resultNamesString.add(o.toString()); - } + public void saveParametersResultNames(List<String> resultNames) { + List<String> resultNamesString = new ArrayList<>(resultNames); param.setResultEnabled(resultNamesString); if (log.isDebugEnabled()) { @@ -638,11 +625,8 @@ } } - public void saveConfigurationResultNames(Object[] resultNames) { - List<String> resultNamesString = new ArrayList<String>(); - for (Object o : resultNames) { - resultNamesString.add(o.toString()); - } + public void saveConfigurationResultNames(List<String> resultNames) { + List<String> resultNamesString = new ArrayList<>(resultNames); IsisFish.config.setDefaultResultNames(resultNamesString); if (log.isDebugEnabled()) { @@ -1211,13 +1195,12 @@ public void populationSelected(final ParamsUI paramsUI) { CardLayout layout = (CardLayout)paramsUI.getPopulationEffectivesPanel().getLayout(); - Object[] selectedPopulationsValues = paramsUI.getListSimulParamsPopulations().getSelectedValues(); - if (ArrayUtils.isNotEmpty(selectedPopulationsValues)) { + List<Population> selectedPopulationsValues = paramsUI.getListSimulParamsPopulations().getSelectedValuesList(); + if (CollectionUtils.isNotEmpty(selectedPopulationsValues)) { paramsUI.getPopulationEffectivesTabbedPane().removeAll(); setPopulations(selectedPopulationsValues); - for (Object selectedPopulationValue : selectedPopulationsValues) { - Population selectedPopulation = (Population)selectedPopulationValue; + for (Population selectedPopulation : selectedPopulationsValues) { final MatrixPanelEditor matrixPanel = new MatrixPanelEditor(); MatrixND populationEffectives = getSimulationParameter().getNumberOf(selectedPopulation); matrixPanel.setMatrix(populationEffectives);