Author: sletellier Date: 2012-06-29 12:00:51 +0200 (Fri, 29 Jun 2012) New Revision: 2359 Url: http://nuiton.org/repositories/revision/jaxx/2359 Log: - Fix generic in listSelector - Clear selection on setValues on listSelector - Remove moved source in NavDemo Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx 2012-06-29 09:48:13 UTC (rev 2358) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx 2012-06-29 10:00:51 UTC (rev 2359) @@ -42,7 +42,7 @@ <script><![CDATA[ public List<People> getSelectedActors() { List<People> actors = Lists.newArrayList(); - for (Movie m : (List<Movie>)comboToListSelector.getSelectedValues()) { + for (Movie m : comboToListSelector.getSelectedValues()) { List<People> actorsToAdd = m.getActors(); actors.removeAll(actorsToAdd); actors.addAll(actorsToAdd); Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx 2012-06-29 09:48:13 UTC (rev 2358) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx 2012-06-29 10:00:51 UTC (rev 2359) @@ -48,7 +48,6 @@ protected String[] getSources() { return new String[]{ getDefaultSource(), "NavDemoHandler.java", - "NavDemoDataProvider.java", "tree/NavDemoTreeNode.java", "tree/NavDemoTreeHelper.java", "tree/NavDemoTreeCellRenderer.java", Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx 2012-06-29 09:48:13 UTC (rev 2358) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx 2012-06-29 10:00:51 UTC (rev 2359) @@ -21,7 +21,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<ListSelector genericType='B'> +<ListSelector genericType='B' superGenericType='B'> <row> <cell fill='horizontal' weightx='1' anchor="west"> <JComboBox id='from' Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx 2012-06-29 09:48:13 UTC (rev 2358) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx 2012-06-29 10:00:51 UTC (rev 2359) @@ -69,7 +69,7 @@ } public void setValues(List<B> values) { - toModel.removeElements(values); + toModel.clearElements(); fromModel.setElements(values); } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx 2012-06-29 09:48:13 UTC (rev 2358) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx 2012-06-29 10:00:51 UTC (rev 2359) @@ -21,7 +21,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<ListSelector genericType='B'> +<ListSelector genericType='B' superGenericType='B'> <import> javax.swing.SwingConstants </import>