Author: sletellier Date: 2009-02-02 18:01:33 +0000 (Mon, 02 Feb 2009) New Revision: 1774 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Log: Ajout d'un JScrollPane Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-02-02 16:18:21 UTC (rev 1773) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-02-02 18:01:33 UTC (rev 1774) @@ -60,9 +60,6 @@ import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; SimulationServiceListener simulationListener; - setContextValue(new MatrixPanelEditor()); - simulParamsNumbers.add(getContextValue(MatrixPanelEditor.class), BorderLayout.CENTER); - simulationListener = new SimulationServiceListener() { @Override public void simulationStart(SimulationService simService, SimulationJob job) { @@ -211,7 +208,7 @@ protected void populationSelected(){ if (listSimulParamsPopulations.getSelectedIndex() != -1){ getContextValue(SimulAction.class).setPopulations(listSimulParamsPopulations.getSelectedValues()); - getContextValue(MatrixPanelEditor.class).setMatrix(getContextValue(SimulAction.class).getSimulationParameter().getNumberOf((Population) listSimulParamsPopulations.getSelectedValue())); + simulParamsNumbers.setMatrix(getContextValue(SimulAction.class).getSimulationParameter().getNumberOf((Population) listSimulParamsPopulations.getSelectedValue())); } } protected void strategySelected(){ @@ -238,8 +235,7 @@ Map<String, Class> values; if (listSimulParamsMesuresList.getSelectedIndex() != -1){ values = getContextValue(SimulAction.class).getRuleParameterName(listSimulParamsMesuresList.getSelectedValue().toString()); - int row = 0; - model = new DefaultTableModel(values.size(), 2){ + model = new DefaultTableModel(){ @Override public boolean isCellEditable(int row, int column) { boolean result = false; @@ -249,14 +245,17 @@ return result; } }; + java.util.List<Object> properties = new ArrayList<Object>(); + java.util.List<GenericCell> cells = new ArrayList<GenericCell>(); for (Iterator<String> it = values.keySet().iterator(); it.hasNext();) { String name = it.next(); - Object properties = getContextValue(SimulAction.class).getRuleParameterValue(name, listSimulParamsMesuresList.getSelectedValue().toString()); + Object propertie = getContextValue(SimulAction.class).getRuleParameterValue(name, listSimulParamsMesuresList.getSelectedValue().toString()); GenericCell value = new GenericCell(name, values.get(name), null); - model.setValueAt(value, row, 0); - model.setValueAt(properties, row, 1); - row++; + properties.add(propertie); + cells.add(value); } + model.addColumn("Name", cells.toArray()); + model.addColumn("Value", properties.toArray()); } simulParamsRules.setModel(model); ParameterColumnEditor cellEditor = new ParameterColumnEditor(); @@ -525,10 +524,12 @@ <cell columns="4" fill="both" weightx="1.0" weighty="0.6"> <JTabbedPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> <tab title='{_("isisfish.params.populationNumbers")}'> - <JPanel id="simulParamsNumbers" name="isisfish.params.populationNumbers" layout='{new BorderLayout()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id="simulParamsNumbers" name="isisfish.params.populationNumbers"/> </tab> <tab title='{_("isisfish.params.ruleParameters")}'> - <JTable id="simulParamsRules" name="isisfish.params.ruleParameters"/> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JTable id="simulParamsRules" name="isisfish.params.ruleParameters"/> + </JScrollPane> </tab> </JTabbedPane> </cell>