Author: echatellier Date: 2013-11-27 00:15:43 +0100 (Wed, 27 Nov 2013) New Revision: 3850 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3850 Log: Stupid java 6 parser Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationHandler.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2013-11-26 22:46:47 UTC (rev 3849) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2013-11-26 23:15:43 UTC (rev 3850) @@ -222,7 +222,7 @@ Object result = null; try { result = MethodUtils.invokeStaticMethod(distClass, "quantile", args.toArray()); - } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) { + } catch (Exception ex) { if (log.isErrorEnabled()) { log.error("Can't invoke quantile method", ex); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationHandler.java 2013-11-26 22:46:47 UTC (rev 3849) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationHandler.java 2013-11-26 23:15:43 UTC (rev 3850) @@ -30,18 +30,18 @@ public class CalibrationHandler extends InputHandler { public void init(CalibrationMethodUI view) { - DefaultComboBoxModel<String> methodModel = new DefaultComboBoxModel<>(); + DefaultComboBoxModel<String> methodModel = new DefaultComboBoxModel<String>(); methodModel.addElement("Simplex"); methodModel.addElement("ABC"); methodModel.addElement("Génétique"); view.getFieldCalibrationMethodSelect().setModel(methodModel); - DefaultListModel<String> objectiveModel = new DefaultListModel<>(); + DefaultListModel<String> objectiveModel = new DefaultListModel<String>(); objectiveModel.addElement("Moindres carrés indice abondance"); objectiveModel.addElement("Moindres carrés debarquements par flottille"); view.getAvailableCalibrationObjectives().setModel(objectiveModel); - DefaultComboBoxModel<String> criteriaModel = new DefaultComboBoxModel<>(); + DefaultComboBoxModel<String> criteriaModel = new DefaultComboBoxModel<String>(); criteriaModel.addElement("Min"); criteriaModel.addElement("Max"); criteriaModel.addElement("Seuil à dépasser");