Author: tchemit Date: 2008-01-12 16:12:30 +0000 (Sat, 12 Jan 2008) New Revision: 145 Modified: trunk/jaxx/src/java/jaxx/tags/swing/JComboBoxHandler.java trunk/jaxx/src/java/jaxx/tags/swing/JListHandler.java trunk/jaxx/src/java/jaxx/tags/swing/JTreeHandler.java Log: g?\195?\169n?\195?\169ration de code 1.5 Modified: trunk/jaxx/src/java/jaxx/tags/swing/JComboBoxHandler.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/swing/JComboBoxHandler.java 2008-01-12 13:39:18 UTC (rev 144) +++ trunk/jaxx/src/java/jaxx/tags/swing/JComboBoxHandler.java 2008-01-12 16:12:30 UTC (rev 145) @@ -49,7 +49,7 @@ if (items != null && !items.isEmpty()) { String listName = list.getId() + "$items"; //TODO ajout du bon typage g�n�rique - list.appendAdditionCode("java.util.List<Object> " + listName + " = new java.util.ArrayList<Object>();"); + list.appendAdditionCode("java.util.List<jaxx.runtime.swing.Item> " + listName + " = new java.util.ArrayList<jaxx.runtime.swing.Item>();"); for (Item item : items) { String id = item.getId(); CompiledObject compiledItem = new CompiledObject(id, ClassDescriptorLoader.getClassDescriptor(Item.class), compiler); Modified: trunk/jaxx/src/java/jaxx/tags/swing/JListHandler.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/swing/JListHandler.java 2008-01-12 13:39:18 UTC (rev 144) +++ trunk/jaxx/src/java/jaxx/tags/swing/JListHandler.java 2008-01-12 16:12:30 UTC (rev 145) @@ -47,7 +47,7 @@ if (items != null && !items.isEmpty()) { String listName = list.getId() + "$items"; //TODO Add the correct generic type - list.appendAdditionCode("java.util.List<Object> " + listName + " = new java.util.ArrayList<Object>();"); + list.appendAdditionCode("java.util.List<jaxx.runtime.swing.Item> " + listName + " = new java.util.ArrayList<jaxx.runtime.swing.Item>();"); for (Item item : items) { String id = item.getId(); CompiledObject compiledItem = new CompiledObject(id, ClassDescriptorLoader.getClassDescriptor(Item.class), compiler); Modified: trunk/jaxx/src/java/jaxx/tags/swing/JTreeHandler.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/swing/JTreeHandler.java 2008-01-12 13:39:18 UTC (rev 144) +++ trunk/jaxx/src/java/jaxx/tags/swing/JTreeHandler.java 2008-01-12 16:12:30 UTC (rev 145) @@ -58,7 +58,7 @@ List<Item> items = tree.getItems(); if (items != null && !items.isEmpty()) { String listName = tree.getId() + "$items"; - tree.appendAdditionCode("java.util.List " + listName + " = new java.util.ArrayList();"); + tree.appendAdditionCode("java.util.List<jaxx.runtime.swing.Item> " + listName + " = new java.util.ArrayList<jaxx.runtime.swing.Item>();"); createItems(tree, items, listName + ".add", compiler); tree.appendAdditionCode(tree.getId() + ".setItems(" + listName + ");"); }