Author: chatellier Date: 2011-06-17 14:23:45 +0000 (Fri, 17 Jun 2011) New Revision: 3422 Log: Fix la mise en facteur des elements de type "TimeUnit" Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-06-17 13:57:16 UTC (rev 3421) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-06-17 14:23:45 UTC (rev 3422) @@ -72,6 +72,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.types.RangeOfValues; +import fr.ifremer.isisfish.types.TimeUnit; import fr.ifremer.isisfish.ui.SimulationUI; import fr.ifremer.isisfish.ui.input.InputAction; import fr.ifremer.isisfish.ui.input.InputContentUI; @@ -587,6 +588,8 @@ if (rangeOfValues.getType().equals("Float")) { result = true; } + } else if (value instanceof TimeUnit) { + result = true; } else if (value instanceof String) { // todo fix string value :( result = true; @@ -658,6 +661,12 @@ MatrixContinuousPanelUI matrixPanel = new MatrixContinuousPanelUI(); matrixPanel.init(matrix.clone(), matrix.clone(), matrix.clone(), null); result = matrixPanel; + } else if (value instanceof TimeUnit) { + TimeUnit timeUnit = (TimeUnit)value; + DefaultContinuousPanelUI ui = new DefaultContinuousPanelUI(); + ui.init(String.valueOf(timeUnit.getTime()), String.valueOf(timeUnit.getTime()), + String.valueOf(timeUnit.getTime()), null); + result = ui; } else { DefaultContinuousPanelUI ui = new DefaultContinuousPanelUI(); ui.init(String.valueOf(value), String.valueOf(value), String.valueOf(value), null); @@ -830,6 +839,10 @@ } // TODO path with no # (normalement pas possible pour les equations) } + else if (value instanceof TimeUnit) { + result = new JTextField(); + ((JTextField)result).setText(String.valueOf(((TimeUnit)value).getTime())); + } else if (value instanceof String) { // valeur nom typées ??? result = new JTextField(); @@ -877,6 +890,9 @@ } else if (value instanceof RangeOfValues) { RangeOfValues rangeOfValues = (RangeOfValues)value; result = new JTextField(rangeOfValues.getValues()); + } else if (value instanceof TimeUnit) { + TimeUnit timeUnit = (TimeUnit)value; + result = new JTextField(String.valueOf(timeUnit.getTime())); } else if (value instanceof Equation) { Equation equation = (Equation)value; // fill component