Author: echatellier Date: 2016-02-05 18:01:40 +0100 (Fri, 05 Feb 2016) New Revision: 4324 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4324 Log: Fix generics Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 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 2016-02-05 15:46:33 UTC (rev 4323) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellUI.jaxx 2016-02-05 17:01:40 UTC (rev 4324) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2015 Ifremer, Code Lutin, Chatellier Eric + Copyright (C) 2009 - 2016 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 @@ -48,7 +48,7 @@ <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}'/> + model='{new javax.swing.DefaultComboBoxModel<Cell>()}' enabled='{getBean() != null}'/> </cell> </row> <row> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsHandler.java 2016-02-05 15:46:33 UTC (rev 4323) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsHandler.java 2016-02-05 17:01:40 UTC (rev 4324) @@ -170,7 +170,7 @@ IsisFish.config.setSimulatorClassfile(simulatorName); } - public List<String> getSimulatorNames() { - return SimulatorStorage.getSimulatorNames(); + public String[] getSimulatorNames() { + return SimulatorStorage.getSimulatorNames().toArray(new String[0]); } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2016-02-05 15:46:33 UTC (rev 4323) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2016-02-05 17:01:40 UTC (rev 4324) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2015 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2016 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 @@ -48,7 +48,7 @@ <cell columns="4" fill="horizontal"> <JComboBox id="fieldSimulAdvParamsSimulatorSelect" genericType="String" - model='{new DefaultComboBoxModel(handler.getSimulatorNames().toArray())}' + model='{new DefaultComboBoxModel<String>(handler.getSimulatorNames())}' onActionPerformed='handler.setSimulatorName()'/> </cell> </row> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java 2016-02-05 15:46:33 UTC (rev 4323) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java 2016-02-05 17:01:40 UTC (rev 4324) @@ -242,8 +242,8 @@ } } - public List<SimulatorLauncher> getSimulationLauncher() { - return SimulationService.getService().getSimulationLaunchers(); + public SimulatorLauncher[] getSimulationLauncher() { + return SimulationService.getService().getSimulationLaunchers().toArray(new SimulatorLauncher[0]); } /** Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2016-02-05 15:46:33 UTC (rev 4323) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2016-02-05 17:01:40 UTC (rev 4324) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2005 - 2015 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2005 - 2016 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 @@ -266,7 +266,7 @@ <cell fill="horizontal" weightx="0.4"> <JComboBox id="comboSelLauncher" genericType="fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher" - model='{new DefaultComboBoxModel(handler.getSimulationLauncher().toArray())}' /> + model='{new DefaultComboBoxModel<fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher>(handler.getSimulationLauncher())}' /> </cell> <cell fill="horizontal" weightx="0.4"> <JButton id="buttonSimulParamsSimulate"