Author: tchemit Date: 2008-01-11 00:03:29 +0000 (Fri, 11 Jan 2008) New Revision: 134 Modified: trunk/jaxx/src/java/jaxx/ClassMap.java trunk/jaxx/src/java/jaxx/runtime/ComponentDescriptor.java trunk/jaxx/src/java/jaxx/runtime/JAXXObjectDescriptor.java trunk/jaxx/src/java/jaxx/runtime/css/Pseudoclasses.java trunk/jaxx/src/java/jaxx/runtime/swing/HBox.java trunk/jaxx/src/java/jaxx/runtime/swing/Item.java trunk/jaxx/src/java/jaxx/runtime/swing/JAXXButtonGroup.java trunk/jaxx/src/java/jaxx/runtime/swing/JAXXComboBox.java trunk/jaxx/src/java/jaxx/runtime/swing/JAXXList.java trunk/jaxx/src/java/jaxx/runtime/swing/JAXXTree.java trunk/jaxx/src/java/jaxx/tags/DefaultComponentHandler.java trunk/jaxx/src/java/jaxx/tags/DefaultObjectHandler.java trunk/jaxx/src/java/jaxx/tags/ScriptHandler.java trunk/jaxx/src/java/jaxx/tags/StyleHandler.java trunk/jaxx/src/java/jaxx/tags/TagManager.java trunk/jaxx/src/java/jaxx/tools/jaxxcapture/JAXXCapture.java Log: fin de migration en 1.5 du code Modified: trunk/jaxx/src/java/jaxx/ClassMap.java =================================================================== --- trunk/jaxx/src/java/jaxx/ClassMap.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/ClassMap.java 2008-01-11 00:03:29 UTC (rev 134) @@ -20,7 +20,7 @@ * A <code>get</code> operation will return the value associated with the class itself, or failing * that, with its nearest ancestor for which there exists a mapping. */ -public class ClassMap extends HashMap<ClassDescriptor, Object> { +public class ClassMap<T> extends HashMap<ClassDescriptor, T> { /** * Keeps track of automatically-added Classes so we can distinguish them from user-added * Classes. Unknown Classes are automatically added to the map during <code>get</code> @@ -40,8 +40,8 @@ * @return the mapping for the class */ @Override - public Object get(Object key) { - Object result = null; + public T get(Object key) { + T result = null; ClassDescriptor c = (ClassDescriptor) key; while (c != null) { result = super.get(c); @@ -70,7 +70,7 @@ * @return the old value associated with the class */ @Override - public Object put(ClassDescriptor key, Object value) { + public T put(ClassDescriptor key, T value) { if (!(key instanceof ClassDescriptor)) throw new IllegalArgumentException("expected ClassDescriptor, got " + key); if (autoKeys.size() > 0) { // remove all automatic keys which descend from the class being modified Modified: trunk/jaxx/src/java/jaxx/runtime/ComponentDescriptor.java =================================================================== --- trunk/jaxx/src/java/jaxx/runtime/ComponentDescriptor.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/runtime/ComponentDescriptor.java 2008-01-11 00:03:29 UTC (rev 134) @@ -11,6 +11,7 @@ String javaClassName; String styleClass; ComponentDescriptor parent; + private static final long serialVersionUID = 3001121176691770788L; public ComponentDescriptor(String id, String javaClassName, String styleClass, ComponentDescriptor parent) { @@ -41,6 +42,7 @@ } + @Override public String toString() { return "ComponentDescriptor[" + id + ", " + javaClassName + ", " + styleClass + "]"; } Modified: trunk/jaxx/src/java/jaxx/runtime/JAXXObjectDescriptor.java =================================================================== --- trunk/jaxx/src/java/jaxx/runtime/JAXXObjectDescriptor.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/runtime/JAXXObjectDescriptor.java 2008-01-11 00:03:29 UTC (rev 134) @@ -11,6 +11,7 @@ public class JAXXObjectDescriptor implements Serializable { private ComponentDescriptor[] descriptors; private Stylesheet stylesheet; + private static final long serialVersionUID = -1706159556633801154L; public JAXXObjectDescriptor(ComponentDescriptor[] descriptors, Modified: trunk/jaxx/src/java/jaxx/runtime/css/Pseudoclasses.java =================================================================== --- trunk/jaxx/src/java/jaxx/runtime/css/Pseudoclasses.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/runtime/css/Pseudoclasses.java 2008-01-11 00:03:29 UTC (rev 134) @@ -15,7 +15,7 @@ private static Map<Object, Map<String, List<PropertyValue>>> properties = new WeakHashMap<Object, Map<String, List<PropertyValue>>>(); - private static class PropertyValue implements Comparable { + private static class PropertyValue implements Comparable<PropertyValue> { private Object value; private int id; @@ -24,22 +24,19 @@ this.id = id; } - public Object getValue() { return value; } - public int getId() { return id; } - - public int compareTo(Object o) { - return getId() - ((PropertyValue) o).getId(); + public int compareTo(PropertyValue o) { + return getId() - o.getId(); } - + @Override public boolean equals(Object o) { if (!(o instanceof PropertyValue)) return false; @@ -52,18 +49,17 @@ return value.getValue().equals(getValue()); } - + @Override public int hashCode() { return (value != null ? value.hashCode() : 0) ^ id; } - + @Override public String toString() { return "PropertyValue[" + value + ", " + id + "]"; } } - private static List<PropertyValue> getPropertyList(Object object, String property) { Map<String, List<PropertyValue>> propertyMap = properties.get(object); if (propertyMap == null) { @@ -80,29 +76,26 @@ return propertyList; } - public static boolean isPropertyApplied(Object object, String property, int id) { - List<PropertyValue> propertyList = getPropertyList(object, property); - for (Object aPropertyList : propertyList) - if (((PropertyValue) aPropertyList).getId() == id) + for (PropertyValue aPropertyList : getPropertyList(object, property)) { + if (aPropertyList.getId() == id) { return true; + } + } return false; } - public static void propertyApplied(Object object, String property, Object value, int id) { List<PropertyValue> propertyList = getPropertyList(object, property); propertyList.add(new PropertyValue(value, id)); Collections.sort(propertyList); } - public static void propertyRemoved(Object object, String property, Object value, int id) { List<PropertyValue> propertyList = getPropertyList(object, property); propertyList.remove(new PropertyValue(value, id)); } - public static Object getCurrentValue(Object object, String property) { List<PropertyValue> propertyList = getPropertyList(object, property); if (propertyList.size() > 0) { @@ -111,29 +104,31 @@ return NO_PSEUDOCLASS; } - public static Object applyProperty(JAXXObject parent, Object object, String property, Object newValue, Object currentValue, int id) { if (!isPropertyApplied(object, property, id)) { Object value = getCurrentValue(object, property); - if (value == NO_PSEUDOCLASS) + if (value == NO_PSEUDOCLASS) { propertyApplied(object, property, wrap(currentValue), -1); + } propertyApplied(object, property, wrap(newValue), id); value = getCurrentValue(object, property); - if (value instanceof DataBinding) + if (value instanceof DataBinding) { parent.applyDataBinding(((DataBinding) value).getId()); + } return value; } else return currentValue; } - public static Object removeProperty(JAXXObject parent, Object object, String property, Object oldValue, Object currentValue, int id) { if (isPropertyApplied(object, property, id)) { Object value = getCurrentValue(object, property); - if (value == NO_PSEUDOCLASS) - throw new java.lang.IllegalStateException("found NO_PSEUDOCLASS value for a property which does not have a default value"); - if (value instanceof DataBinding) + if (value == NO_PSEUDOCLASS) { + throw new IllegalStateException("found NO_PSEUDOCLASS value for a property which does not have a default value"); + } + if (value instanceof DataBinding) { parent.removeDataBinding(((DataBinding) value).getId()); + } propertyRemoved(object, property, wrap(oldValue), id); value = getCurrentValue(object, property); return value; @@ -141,47 +136,38 @@ return currentValue; } - public static Object wrap(boolean value) { return value; } - public static Object wrap(byte value) { return value; } - public static Object wrap(short value) { return value; } - public static Object wrap(int value) { return value; } - public static Object wrap(long value) { return value; } - public static Object wrap(float value) { return value; } - public static Object wrap(double value) { return value; } - public static Object wrap(char value) { return value; } - public static Object wrap(Object value) { return value; } Modified: trunk/jaxx/src/java/jaxx/runtime/swing/HBox.java =================================================================== --- trunk/jaxx/src/java/jaxx/runtime/swing/HBox.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/runtime/swing/HBox.java 2008-01-11 00:03:29 UTC (rev 134) @@ -88,6 +88,7 @@ } + @Override public Insets getInsets() { Insets result = super.getInsets(); if (margin != null) { Modified: trunk/jaxx/src/java/jaxx/runtime/swing/Item.java =================================================================== --- trunk/jaxx/src/java/jaxx/runtime/swing/Item.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/runtime/swing/Item.java 2008-01-11 00:03:29 UTC (rev 134) @@ -28,7 +28,6 @@ private Item parent; private PropertyChangeSupport propertyChangeSupport; - /** * Creates a new Item. This should only be called from compiled JAXX files. * @@ -44,7 +43,6 @@ this.selected = selected; } - /** * Returns this item's ID. * @@ -54,7 +52,6 @@ return id; } - /** * Returns the string that should be used to represent the item at display time. If <code>null</code>, * <code>String.valueOf(getValue())</code> will be used instead. @@ -66,7 +63,6 @@ return label; } - /** * Sets the item's display string. If <code>null, String.valueOf(getValue())</code> will be used instead. * @@ -79,7 +75,6 @@ firePropertyChange(LABEL_PROPERTY, oldLabel, label); } - /** * Returns the item's actual value as it appears in the component's model. The <code>Item</code> itself is not * visible from the model, only the value. @@ -91,7 +86,6 @@ return value; } - /** * Sets the item's value as it appears in the component's model. The <code>Item</code> itself is not * visible from the model, only the value. @@ -105,7 +99,6 @@ firePropertyChange(VALUE_PROPERTY, oldValue, value); } - /** * Returns <code>true</code> if this item is currently selected. This is a bound property. * @@ -116,7 +109,6 @@ return selected; } - /** * Sets the item's selection state. This is a bound property. * @@ -129,32 +121,31 @@ firePropertyChange(SELECTED_PROPERTY, oldSelected, selected); } - /** * Adds a new child node (Items can be nested in trees). * * @param item the new child item */ public void addChild(Item item) { - if (children == null) + if (children == null) { children = new ArrayList<Item>(); + } children.add(item); item.parent = this; } - /** * Returns a list of this item's children. * * @return a list of all nested child nodes */ public List<Item> getChildren() { - if (children == null) + if (children == null) { children = new ArrayList<Item>(); + } return children; } - /** * Returns the <code>Item</code> containing this <code>Item</code>, or <code>null</code> for a top-level * <code>Item</code>. @@ -165,40 +156,36 @@ return parent; } - private PropertyChangeSupport getPropertyChangeSupport() { - if (propertyChangeSupport == null) + if (propertyChangeSupport == null) { propertyChangeSupport = new SwingPropertyChangeSupport(this); + } return propertyChangeSupport; } - public void addPropertyChangeListener(PropertyChangeListener listener) { getPropertyChangeSupport().addPropertyChangeListener(listener); } - public void addPropertyChangeListener(String property, PropertyChangeListener listener) { getPropertyChangeSupport().addPropertyChangeListener(property, listener); } - public void removePropertyChangeListener(PropertyChangeListener listener) { getPropertyChangeSupport().removePropertyChangeListener(listener); } - public void removePropertyChangeListener(String property, PropertyChangeListener listener) { getPropertyChangeSupport().removePropertyChangeListener(property, listener); } - protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { - if (propertyChangeSupport != null) + if (propertyChangeSupport != null) { getPropertyChangeSupport().firePropertyChange(propertyName, oldValue, newValue); + } } - + @Override public String toString() { return getClass().getName() + "[" + value + "]"; } Modified: trunk/jaxx/src/java/jaxx/runtime/swing/JAXXButtonGroup.java =================================================================== --- trunk/jaxx/src/java/jaxx/runtime/swing/JAXXButtonGroup.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/runtime/swing/JAXXButtonGroup.java 2008-01-11 00:03:29 UTC (rev 134) @@ -22,15 +22,17 @@ updateSelectedValue(); } }; + private static final long serialVersionUID = -2096340516687228691L; + @Override public void add(AbstractButton button) { super.add(button); button.addChangeListener(changeListener); updateSelectedValue(); } - + @Override public void remove(AbstractButton button) { super.remove(button); button.removeChangeListener(changeListener); @@ -39,9 +41,9 @@ public void updateSelectedValue() { - Enumeration/*<AbstractButton>*/ e = getElements(); + Enumeration<AbstractButton> e = getElements(); while (e.hasMoreElements()) { - AbstractButton button = (AbstractButton) e.nextElement(); + AbstractButton button = e.nextElement(); if (button.isSelected()) { Object selectedValue = button.getClientProperty("$value"); if (selectedValue != getSelectedValue()) @@ -64,8 +66,9 @@ protected PropertyChangeSupport getPropertyChangeSupport() { - if (propertyChangeSupport == null) + if (propertyChangeSupport == null) { propertyChangeSupport = new PropertyChangeSupport(this); + } return propertyChangeSupport; } @@ -91,8 +94,9 @@ private void firePropertyChange(Object oldValue) { - if (propertyChangeSupport != null) + if (propertyChangeSupport != null) { getPropertyChangeSupport().firePropertyChange(SELECTED_VALUE_PROPERTY, oldValue, getSelectedValue()); + } } } Modified: trunk/jaxx/src/java/jaxx/runtime/swing/JAXXComboBox.java =================================================================== --- trunk/jaxx/src/java/jaxx/runtime/swing/JAXXComboBox.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/runtime/swing/JAXXComboBox.java 2008-01-11 00:03:29 UTC (rev 134) @@ -44,13 +44,17 @@ } if (item.isSelected()) { if (index != -1) // it was already selected + { return; + } newSelection = new int[oldSelection.length + 1]; System.arraycopy(oldSelection, 0, newSelection, 0, oldSelection.length); newSelection[newSelection.length - 1] = itemIndex; } else { if (index == -1) // it already wasn't selected + { return; + } newSelection = new int[oldSelection.length - 1]; System.arraycopy(oldSelection, 0, newSelection, 0, index); System.arraycopy(oldSelection, index + 1, newSelection, index, oldSelection.length - 1 - index); @@ -61,8 +65,9 @@ for (int i = 0; i < getSize(); i++) { if (getElementAt(i) == ((Item) e.getSource()).getValue()) { fireContentsChanged(JAXXComboBoxModel.this, i, i); - if (getSelectedIndex() == i) + if (getSelectedIndex() == i) { fireItemStateChanged(new ItemEvent(JAXXComboBox.this, ItemEvent.ITEM_STATE_CHANGED, getElementAt(i), ItemEvent.DESELECTED)); + } return; } } @@ -70,7 +75,6 @@ } }; for (Item item : items) { - item.addPropertyChangeListener(listener); } } @@ -121,8 +125,9 @@ if (item != null) { String label = item.getLabel(); - if (label != null) + if (label != null) { value = label; + } } } return super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); @@ -137,8 +142,9 @@ for (int i = items.size() - 1; i >= 0; i--) { boolean selected = getSelectedIndex() == i; Item item = items.get(i); - if (selected != item.isSelected()) + if (selected != item.isSelected()) { item.setSelected(selected); + } } } } @@ -147,11 +153,11 @@ // this way we can keep it marked protected and still allow code in this file to call it + @Override protected void fireItemStateChanged(ItemEvent e) { super.fireItemStateChanged(e); } - public void setItems(List<Item> items) { setModel(new JAXXComboBoxModel(items)); List<Integer> selectedIndexList = new ArrayList<Integer>(); Modified: trunk/jaxx/src/java/jaxx/runtime/swing/JAXXList.java =================================================================== --- trunk/jaxx/src/java/jaxx/runtime/swing/JAXXList.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/runtime/swing/JAXXList.java 2008-01-11 00:03:29 UTC (rev 134) @@ -18,9 +18,10 @@ public class JAXXList extends JList { public class JAXXListModel extends AbstractListModel { - private List/*<Item>*/ items; + private List<Item> items; + private static final long serialVersionUID = -1598924187490122036L; - public JAXXListModel(List/*<Item>*/ items) { + public JAXXListModel(List<Item> items) { this.items = items; PropertyChangeListener listener = new PropertyChangeListener() { @@ -39,13 +40,17 @@ } if (item.isSelected()) { if (index != -1) // it was already selected + { return; + } newSelection = new int[oldSelection.length + 1]; System.arraycopy(oldSelection, 0, newSelection, 0, oldSelection.length); newSelection[newSelection.length - 1] = itemIndex; } else { if (index == -1) // it already wasn't selected + { return; + } newSelection = new int[oldSelection.length - 1]; System.arraycopy(oldSelection, 0, newSelection, 0, index); System.arraycopy(oldSelection, index + 1, newSelection, index, oldSelection.length - 1 - index); @@ -55,21 +60,23 @@ for (int i = 0; i < getSize(); i++) { if (getElementAt(i) == ((Item) e.getSource()).getValue()) { fireContentsChanged(JAXXListModel.this, i, i); - if (isSelectedIndex(i)) + if (isSelectedIndex(i)) { fireSelectionValueChanged(i, i, false); + } return; } } } } }; - for (int i = 0; i < items.size(); i++) - ((Item) items.get(i)).addPropertyChangeListener(listener); + for (Item item : items) { + item.addPropertyChangeListener(listener); + } } public Object getElementAt(int i) { - return ((Item) items.get(i)).getValue(); + return items.get(i).getValue(); } @@ -78,18 +85,17 @@ } } - ; - - public JAXXList() { setCellRenderer(new DefaultListCellRenderer() { + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { ListModel model = list.getModel(); if (model instanceof JAXXListModel) { - Item item = (Item) ((JAXXListModel) model).items.get(index); + Item item = ((JAXXListModel) model).items.get(index); String label = item.getLabel(); - if (label != null) + if (label != null) { value = label; + } } return super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); } @@ -99,12 +105,13 @@ public void valueChanged(ListSelectionEvent e) { ListModel model = getModel(); if (model instanceof JAXXListModel) { - List/*<Item>*/ items = ((JAXXListModel) model).items; + List<Item> items = ((JAXXListModel) model).items; for (int i = items.size() - 1; i >= 0; i--) { boolean selected = isSelectedIndex(i); - Item item = (Item) items.get(i); - if (selected != item.isSelected()) + Item item = items.get(i); + if (selected != item.isSelected()) { item.setSelected(selected); + } } } } @@ -113,6 +120,7 @@ // this way we can keep it marked protected and still allow code in this file to call it + @Override protected void fireSelectionValueChanged(int firstIndex, int lastIndex, boolean isAdjusting) { super.fireSelectionValueChanged(firstIndex, lastIndex, isAdjusting); } @@ -123,15 +131,18 @@ } - public void setItems(List/*<Item>*/ items) { + public void setItems(List<Item> items) { setModel(new JAXXListModel(items)); - List/*<Integer>*/ selectedIndexList = new ArrayList/*<Integer>*/(); - for (int i = 0; i < items.size(); i++) - if (((Item) items.get(i)).isSelected()) - selectedIndexList.add(new Integer(i)); + List<Integer> selectedIndexList = new ArrayList<Integer>(); + for (int i = 0; i < items.size(); i++) { + if (items.get(i).isSelected()) { + selectedIndexList.add(i); + } + } int[] selectedIndices = new int[selectedIndexList.size()]; - for (int i = 0; i < selectedIndexList.size(); i++) - selectedIndices[i] = ((Integer) selectedIndexList.get(i)).intValue(); + for (int i = 0; i < selectedIndexList.size(); i++) { + selectedIndices[i] = selectedIndexList.get(i); + } setSelectedIndices(selectedIndices); } } \ No newline at end of file Modified: trunk/jaxx/src/java/jaxx/runtime/swing/JAXXTree.java =================================================================== --- trunk/jaxx/src/java/jaxx/runtime/swing/JAXXTree.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/runtime/swing/JAXXTree.java 2008-01-11 00:03:29 UTC (rev 134) @@ -23,25 +23,29 @@ public class JAXXTreeModel implements TreeModel { private Item root; - private List/*<TreeModelListener>*/ listeners = new ArrayList/*<TreeModelListener>*/(); + private List<TreeModelListener> listeners = new ArrayList<TreeModelListener>(); - public JAXXTreeModel(List/*<Item>*/ items) { - if (items.size() == 1) - this.root = (Item) items.get(0); + public JAXXTreeModel(List<Item> items) { + if (items.size() == 1) { + this.root = items.get(0); + } else { this.root = new Item(null, null, SYNTHETIC, false); - for (int i = 0; i < items.size(); i++) - root.addChild((Item) items.get(i)); + for (Item item : items) { + root.addChild(item); + } } PropertyChangeListener listener = new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent e) { if (e.getPropertyName().equals(Item.SELECTED_PROPERTY)) { Item item = (Item) e.getSource(); - if (item.isSelected()) + if (item.isSelected()) { addSelectionPath(getTreePath(item)); - else + } + else { removeSelectionPath(getTreePath(item)); + } } else { Item item = (Item) e.getSource(); boolean root = item.getParent() == null; @@ -58,9 +62,10 @@ private void addPropertyChangeListener(Item item, PropertyChangeListener listener) { item.addPropertyChangeListener(listener); - List/*<Item>*/ children = item.getChildren(); - for (int i = 0; i < children.size(); i++) - addPropertyChangeListener((Item) children.get(i), listener); + List<Item> children = item.getChildren(); + for (Item aChildren : children) { + addPropertyChangeListener(aChildren, listener); + } } @@ -80,9 +85,9 @@ if (node.getValue() == value) return node; else { - List/*<Item>*/ children = node.getChildren(); - for (int i = 0; i < children.size(); i++) { - Item result = findItem((Item) children.get(i), value); + List<Item> children = node.getChildren(); + for (Item aChildren : children) { + Item result = findItem(aChildren, value); if (result != null) return result; } @@ -92,7 +97,7 @@ private TreePath getTreePath(Item node) { - List/*<Object>*/ path = new ArrayList/*<Object>*/(); + List<Object> path = new ArrayList<Object>(); while (node != null) { path.add(0, node.getValue()); node = node.getParent(); @@ -103,7 +108,7 @@ public Object getChild(Object parent, int index) { Item node = findItem(parent); - return ((Item) node.getChildren().get(index)).getValue(); + return node.getChildren().get(index).getValue(); } @@ -115,10 +120,11 @@ public int getIndexOfChild(Object parent, Object child) { Item node = findItem(parent); - List/*<Item>*/ children = node.getChildren(); - for (int i = 0; i < children.size(); i++) - if (((Item) children.get(i)).getValue() == child) + List<Item> children = node.getChildren(); + for (int i = 0,j = children.size();i<j; i++) + if (children.get(i).getValue() == child) { return i; + } return -1; } @@ -140,8 +146,9 @@ public void fireTreeNodesChanged(TreeModelEvent e) { - for (int i = 0; i < listeners.size(); i++) - ((TreeModelListener) listeners.get(i)).treeNodesChanged(e); + for (TreeModelListener listener : listeners) { + listener.treeNodesChanged(e); + } } @@ -149,19 +156,18 @@ } } - ; - - public JAXXTree() { setCellRenderer(new DefaultTreeCellRenderer() { + @Override public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) { TreeModel model = tree.getModel(); if (model instanceof JAXXTreeModel) { Item item = ((JAXXTreeModel) model).findItem(value); if (item != null) { String label = item.getLabel(); - if (label != null) + if (label != null) { value = label; + } } } return super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); @@ -171,27 +177,31 @@ addTreeSelectionListener(new TreeSelectionListener() { public void valueChanged(TreeSelectionEvent e) { TreeModel model = getModel(); - if (model instanceof JAXXTreeModel) + if (model instanceof JAXXTreeModel) { scan((JAXXTreeModel) model, ((JAXXTreeModel) model).root); + } } private void scan(JAXXTreeModel model, Item item) { TreePath path = model.getTreePath(item); - if (item.isSelected() != isPathSelected(path)) + if (item.isSelected() != isPathSelected(path)) { item.setSelected(!item.isSelected()); - List/*<Item>*/ children = item.getChildren(); - for (int i = 0; i < children.size(); i++) - scan(model, (Item) children.get(i)); + } + List<Item> children = item.getChildren(); + for (Item aChildren : children) { + scan(model, aChildren); + } } }); } - public void setItems(List/*<Item>*/ items) { + public void setItems(List<Item> items) { JAXXTreeModel model = new JAXXTreeModel(items); - if (model.getRoot() != null) + if (model.getRoot() != null) { setRootVisible(model.getRoot() != SYNTHETIC); + } setModel(model); } Modified: trunk/jaxx/src/java/jaxx/tags/DefaultComponentHandler.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/DefaultComponentHandler.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/tags/DefaultComponentHandler.java 2008-01-11 00:03:29 UTC (rev 134) @@ -26,8 +26,9 @@ public DefaultComponentHandler(ClassDescriptor beanClass) { super(beanClass); - if (!ClassDescriptorLoader.getClassDescriptor(Component.class).isAssignableFrom(beanClass)) + if (!ClassDescriptorLoader.getClassDescriptor(Component.class).isAssignableFrom(beanClass)) { throw new IllegalArgumentException(getClass().getName() + " does not support the class " + beanClass.getName()); + } } @Override @@ -36,8 +37,9 @@ super.init(); containerDelegate = (String) getJAXXBeanInfo().getJAXXBeanDescriptor().getValue("containerDelegate"); - if (containerDelegate == null && ClassDescriptorLoader.getClassDescriptor(Container.class).isAssignableFrom(getBeanClass().getSuperclass())) + if (containerDelegate == null && ClassDescriptorLoader.getClassDescriptor(Container.class).isAssignableFrom(getBeanClass().getSuperclass())) { containerDelegate = ((DefaultComponentHandler) TagManager.getTagHandler(getBeanClass().getSuperclass())).getContainerDelegate(); + } } } @@ -54,8 +56,9 @@ addProxyEventInfo("getY", ComponentListener.class); addProxyEventInfo("getWidth", ComponentListener.class); addProxyEventInfo("getHeight", ComponentListener.class); - if (ClassDescriptorLoader.getClassDescriptor(Container.class).isAssignableFrom(getBeanClass())) + if (ClassDescriptorLoader.getClassDescriptor(Container.class).isAssignableFrom(getBeanClass())) { addProxyEventInfo("getComponentCount", ContainerListener.class); + } } @Override Modified: trunk/jaxx/src/java/jaxx/tags/DefaultObjectHandler.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/DefaultObjectHandler.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/tags/DefaultObjectHandler.java 2008-01-11 00:03:29 UTC (rev 134) @@ -128,15 +128,17 @@ JAXXPropertyDescriptor[] propertiesArray = jaxxBeanInfo.getJAXXPropertyDescriptors(); properties = new HashMap<String, JAXXPropertyDescriptor>(); - for (int i = propertiesArray.length - 1; i >= 0; i--) + for (int i = propertiesArray.length - 1; i >= 0; i--) { properties.put(propertiesArray[i].getName(), propertiesArray[i]); + } JAXXEventSetDescriptor[] eventsArray = jaxxBeanInfo.getJAXXEventSetDescriptors(); events = new HashMap<String, JAXXEventSetDescriptor>(); for (int i = eventsArray.length - 1; i >= 0; i--) { MethodDescriptor[] methods = eventsArray[i].getListenerMethods(); - for (MethodDescriptor method : methods) + for (MethodDescriptor method : methods) { events.put(method.getName(), eventsArray[i]); + } } configureProxyEventInfo(); @@ -283,6 +285,7 @@ * * @param objectCode Java code which evaluates to the object to which to add the listener * *@param dataBinding the name of the data binding this listener is a part of + * @param dataBinding databinding * @param memberName the name of the field or method to listen to * @param propertyChangeListenerCode Java code which evaluates to a <code>PropertyChangeListener</code> * @param compiler the current <code>JAXXCompiler</code> @@ -319,10 +322,12 @@ return result.toString(); } else { String propertyName = null; - if (memberName.startsWith("get")) + if (memberName.startsWith("get")) { propertyName = Introspector.decapitalize(memberName.substring("get".length())); - else if (memberName.startsWith("is")) + } + else if (memberName.startsWith("is")) { propertyName = Introspector.decapitalize(memberName.substring("is".length())); + } else { try { getBeanClass().getFieldDescriptor(memberName); @@ -375,10 +380,11 @@ String modelClassName = modelMemberName != null ? getBeanClass().getMethodDescriptor(modelMemberName, new ClassDescriptor[0]).getReturnType().getName() : JAXXCompiler.getCanonicalName(getBeanClass()); String code = objectCode + (eventInfo.modelName != null ? "." + modelMemberName + "()" : ""); result.append("((").append(modelClassName).append(") $bindingSources.remove(\"").append(code).append("\")).").append(eventInfo.removeMethod).append("((").append(JAXXCompiler.getCanonicalName(eventInfo.listenerClass)).append(") jaxx.runtime.Util.getEventListener(").append(JAXXCompiler.getCanonicalName(eventInfo.listenerClass)).append(".class, ").append(compiler.getRootObject().getJavaCode()).append(", ").append(TypeManager.getJavaCode(methodName)).append("));\n"); - if (eventInfo.modelName != null) + if (eventInfo.modelName != null) { result.append(getRemoveMemberListenerCode(objectCode, dataBinding, "get" + JAXXCompiler.capitalize(eventInfo.modelName), "jaxx.runtime.Util.getDataBindingUpdateListener(this, \"" + dataBinding + "\")", compiler)); + } return result.toString(); } catch (NoSuchMethodException e) { @@ -386,10 +392,12 @@ } } else { String propertyName = null; - if (memberName.startsWith("get")) + if (memberName.startsWith("get")) { propertyName = Introspector.decapitalize(memberName.substring("get".length())); - else if (memberName.startsWith("is")) + } + else if (memberName.startsWith("is")) { propertyName = Introspector.decapitalize(memberName.substring("is".length())); + } else { try { getBeanClass().getFieldDescriptor(memberName); @@ -519,8 +527,9 @@ info.modelName = modelName; info.addMethod = addMethod; info.removeMethod = removeMethod; - if (eventInfos == null) + if (eventInfos == null) { eventInfos = new HashMap<String, ProxyEventInfo>(); + } eventInfos.put(memberName, info); } @@ -539,12 +548,14 @@ throw new RuntimeException(e); } CompiledObject object = objectMap.get(tag); - if (object == null) + if (object == null) { throw new IllegalStateException("unable to find CompiledObject associated with tag <" + tag.getTagName() + ">; should have been registered before second pass"); + } compiler.checkOverride(object); String constructorParams = tag.getAttribute("constructorParams"); - if (constructorParams != null && constructorParams.length() > 0) + if (constructorParams != null && constructorParams.length() > 0) { object.setConstructorParams(compiler.getScriptManager().trimScript(constructorParams)); + } setDefaults(object, tag, compiler); setAttributes(object, tag, compiler); @@ -555,13 +566,15 @@ public void registerCompiledObject(Element tag, JAXXCompiler compiler) { String id = tag.getAttribute("id"); - if (id == null || id.length() == 0) + if (id == null || id.length() == 0) { id = compiler.getAutoId(getBeanClass()); + } CompiledObject object = createCompiledObject(id, compiler); objectMap.put(tag, object); String styleClass = tag.getAttribute("styleClass").trim(); - if (styleClass.length() > 0) + if (styleClass.length() > 0) { object.setStyleClass(styleClass); + } compiler.registerCompiledObject(object); } @@ -623,21 +636,25 @@ protected void scanAttributesForDependencies(Element tag, JAXXCompiler compiler) { List<Attr> attributes = new ArrayList<Attr>(); NamedNodeMap children = tag.getAttributes(); - for (int i = 0; i < children.getLength(); i++) + for (int i = 0; i < children.getLength(); i++) { attributes.add((Attr) children.item(i)); + } Collections.sort(attributes, getAttributeComparator()); for (Attr attribute : attributes) { String name = attribute.getName(); String value = attribute.getValue(); - if (name.equals("constraints") || isEventHandlerName(name)) + if (name.equals("constraints") || isEventHandlerName(name)) { compiler.preprocessScript(value + ";"); // adds dependencies as a side effect + } else if (name.equals("constructorParams")) { String[] params = value.split("\\s*,\\s*"); - for (String param : params) + for (String param : params) { compiler.preprocessScript(param + ";"); - } else if (value.startsWith("{") && value.endsWith("}")) + } + } else if (value.startsWith("{") && value.endsWith("}")) { compiler.preprocessScript(value.substring(1, value.length() - 1) + ";"); + } } } Modified: trunk/jaxx/src/java/jaxx/tags/ScriptHandler.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/ScriptHandler.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/tags/ScriptHandler.java 2008-01-11 00:03:29 UTC (rev 134) @@ -40,8 +40,9 @@ FileReader in = new FileReader(scriptFile); char[] readBuffer = new char[2048]; int c; - while ((c = in.read(readBuffer)) > 0) + while ((c = in.read(readBuffer)) > 0) { scriptBuffer.write(readBuffer, 0, c); + } } catch (FileNotFoundException e) { compiler.reportError("script file not found: " + scriptFile); @@ -67,8 +68,9 @@ String scriptString = script.toString().trim(); if (scriptString.length() > 0) { - if (scriptFile != null) + if (scriptFile != null) { compiler.reportError("<script> tag has both a source attribute and an inline script"); + } compiler.registerScript(script.toString()); } } Modified: trunk/jaxx/src/java/jaxx/tags/StyleHandler.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/StyleHandler.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/tags/StyleHandler.java 2008-01-11 00:03:29 UTC (rev 134) @@ -128,8 +128,9 @@ protected Rule processRule(SimpleNode ruleNode) { - if (ruleNode.getId() != CSSParserTreeConstants.JJTRULE) + if (ruleNode.getId() != CSSParserTreeConstants.JJTRULE) { throw new IllegalArgumentException("argument node is not a Rule"); + } SimpleNode selectorsNode = ruleNode.getChild(0); assert selectorsNode.getId() == CSSParserTreeConstants.JJTSELECTORS : "expected node to be of type Selectors"; @@ -146,8 +147,9 @@ String key = declarationNode.getChild(0).getText(); SimpleNode valueNode = declarationNode.getChild(1); String value = valueNode.getText(); - if (valueNode.firstToken.kind == CSSParserConstants.STRING) + if (valueNode.firstToken.kind == CSSParserConstants.STRING) { value = value.substring(1, value.length() - 1); + } properties.put(key, value); } } Modified: trunk/jaxx/src/java/jaxx/tags/TagManager.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/TagManager.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/tags/TagManager.java 2008-01-11 00:03:29 UTC (rev 134) @@ -40,7 +40,7 @@ * TagHandler instances, because subclasses of the bean class should be handled by the same TagHandler * (assuming no more specific mappings exist), which requires creating a new instance of the TagHandler. */ - private static ClassMap registeredBeans = new ClassMap(); + private static ClassMap<Class> registeredBeans = new ClassMap<Class>(); // still targeting 1.4, so I can't use javax.xml.namespace.QName private static class QName { @@ -203,17 +203,17 @@ } String namespace = getNamespace(beanClass); String tag = getSimpleName(beanClass); - DefaultObjectHandler handler = (DefaultObjectHandler) registeredTags.get(new QName(namespace, tag)); + TagHandler handler = registeredTags.get(new QName(namespace, tag)); if (handler == null) { - Class handlerClass = (Class) registeredBeans.get(beanClass); + Class<?> handlerClass = registeredBeans.get(beanClass); if (handlerClass == null) { throw new CompilerException("unable to find handler for " + beanClass); } - Constructor constructor = handlerClass.getConstructor(ClassDescriptor.class); + Constructor<?> constructor = handlerClass.getConstructor(ClassDescriptor.class); handler = (DefaultObjectHandler) constructor.newInstance(beanClass); registerTag(namespace, tag, handler); } - return handler; + return (DefaultObjectHandler) handler; } catch (InstantiationException e) { throw new RuntimeException(e); Modified: trunk/jaxx/src/java/jaxx/tools/jaxxcapture/JAXXCapture.java =================================================================== --- trunk/jaxx/src/java/jaxx/tools/jaxxcapture/JAXXCapture.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/tools/jaxxcapture/JAXXCapture.java 2008-01-11 00:03:29 UTC (rev 134) @@ -47,7 +47,7 @@ import java.util.jar.Manifest; public class JAXXCapture { - private static ClassMap objectHandlers = new ClassMap(); + private static ClassMap<Object> objectHandlers = new ClassMap<Object>(); static { objectHandlers.put(ClassDescriptorLoader.getClassDescriptor(Object.class), new ObjectHandler()); @@ -69,7 +69,7 @@ this.classLoader = classLoader; } - + @Override public void dispatchEvent(AWTEvent event) { if (event.getID() == MouseEvent.MOUSE_PRESSED && ((MouseEvent) event).isControlDown()) { Component target = ((MouseEvent) event).getComponent();