October 2009 - Jaxx-commits - mailman.cloud.codelutin.com

r1550 - trunk/jaxx-runtime-api/src/main/java/jaxx/runtime
by tchemit＠users.nuiton.org 03 Oct '09

03 Oct '09

Author: tchemit Date: 2009-10-04 01:06:18 +0200 (Sun, 04 Oct 2009) New Revision: 1550 Modified: trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/DefaultJAXXContext.java trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/JAXXContextEntryDef.java trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/JAXXInitialContext.java Log: - use generics - add javadoc - add 'add' method for a context entry def in JAXXInitialContext Modified: trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/DefaultJAXXContext.java =================================================================== --- trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/DefaultJAXXContext.java 2009-10-03 18:30:06 UTC (rev 1549) +++ trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/DefaultJAXXContext.java 2009-10-03 23:06:18 UTC (rev 1550) @@ -31,10 +31,10 @@ /** le context parent */ protected JAXXContext parentContext; /** les données contenues dans le context */ - protected final Map<JAXXContextEntryDef, Object> data; + protected final Map<JAXXContextEntryDef<?>, Object> data; public DefaultJAXXContext() { - data = new HashMap<JAXXContextEntryDef, Object>(); + data = new HashMap<JAXXContextEntryDef<?>, Object>(); } public DefaultJAXXContext(JAXXObject ui) { @@ -76,7 +76,7 @@ if (parentContext != null && parentContext.getClass() == clazz || PARENT_CONTEXT_ENTRY.accept(clazz, name)) { return (T) getParentContext(); } - for (Entry<JAXXContextEntryDef, Object> entry : data.entrySet()) { + for (Entry<JAXXContextEntryDef<?>, Object> entry : data.entrySet()) { if (entry.getKey().accept(clazz, name)) { return (T) entry.getValue(); } @@ -140,7 +140,7 @@ */ public String[] getKeys(Class<?> klass) { List<String> keys = new java.util.ArrayList<String>(); - for (JAXXContextEntryDef key : data.keySet()) { + for (JAXXContextEntryDef<?> key : data.keySet()) { if (key.getKlass() == klass) { keys.add(key.getName()); } @@ -172,8 +172,8 @@ setParentContext(null); return (T) old; } - JAXXContextEntryDef entry = null; - for (JAXXContextEntryDef entryDef : data.keySet()) { + JAXXContextEntryDef<?> entry = null; + for (JAXXContextEntryDef<?> entryDef : data.keySet()) { if (entryDef.accept(klazz, name)) { entry = entryDef; break; Modified: trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/JAXXContextEntryDef.java =================================================================== --- trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/JAXXContextEntryDef.java 2009-10-03 18:30:06 UTC (rev 1549) +++ trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/JAXXContextEntryDef.java 2009-10-03 23:06:18 UTC (rev 1550) @@ -8,6 +8,7 @@ * <p/> * Use the factory methods <code>newDef</code> and <code>newListDef</code< to obtain new instances. * + * @param <O> type of the entry associated to the definition * @author chemit */ public class JAXXContextEntryDef<O> implements java.io.Serializable { Modified: trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/JAXXInitialContext.java =================================================================== --- trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/JAXXInitialContext.java 2009-10-03 18:30:06 UTC (rev 1549) +++ trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/JAXXInitialContext.java 2009-10-03 23:06:18 UTC (rev 1550) @@ -31,7 +31,7 @@ * @return the instance of the context */ public JAXXInitialContext add(Object value) { - return add(null, value); + return add((String) null, value); } /** @@ -47,6 +47,19 @@ } /** + * Register a named value in the context. + * + * @param <O> type of data to add + * @param def definition of entry + * @param value the value to registred + * @return the instance of the context + */ + public <O> JAXXInitialContext add(JAXXContextEntryDef<O> def, O value) { + def.setContextValue(this, value); + return this; + } + + /** * Inject all the registed values into the {@link JAXXObject} * * @param dst the object to fill. @@ -55,7 +68,7 @@ if (parentContext != null) { dst.setContextValue(parentContext); } - for (Entry<JAXXContextEntryDef, Object> entry : data.entrySet()) { + for (Entry<JAXXContextEntryDef<?>, Object> entry : data.entrySet()) { dst.setContextValue(entry.getValue(), entry.getKey().getName()); } } @@ -89,5 +102,4 @@ public <O extends Container> O getParentContainer(Object top, Class<O> clazz) { throw new RuntimeException("not implemented"); } - }

1 0

r1549 - trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation
by tchemit＠users.nuiton.org 03 Oct '09

03 Oct '09

Author: tchemit Date: 2009-10-03 20:30:06 +0200 (Sat, 03 Oct 2009) New Revision: 1549 Modified: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeSelectionAdapter.java trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeSelectionAdapterWithCardLayout.java Log: deprecate old implementation of NavigationTreeSelection (should be changed in isis) Modified: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeSelectionAdapter.java =================================================================== --- trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeSelectionAdapter.java 2009-10-03 18:22:57 UTC (rev 1548) +++ trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeSelectionAdapter.java 2009-10-03 18:30:06 UTC (rev 1549) @@ -13,7 +13,12 @@ import javax.swing.tree.TreePath; import java.awt.Component; -/** A {@link javax.swing.event.TreeSelectionListener} implementation@author chemit */ +/** + * A {@link javax.swing.event.TreeSelectionListener} implementation + * @author chemit + * @deprecated since 1.7.2, use now {@link NavigationTreeHandler} + */ +@Deprecated public abstract class NavigationTreeSelectionAdapter implements TreeSelectionListener { /** to use log facility, just put in your code: log.info(\"...\"); */ Modified: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeSelectionAdapterWithCardLayout.java =================================================================== --- trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeSelectionAdapterWithCardLayout.java 2009-10-03 18:22:57 UTC (rev 1548) +++ trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeSelectionAdapterWithCardLayout.java 2009-10-03 18:30:06 UTC (rev 1549) @@ -22,7 +22,9 @@ * A single container managed by the cardlayout is used to display the components associated with tree's nodes. * * @author chemit + * @deprecated since 1.7.2, use now {@link NavigationTreeHandler} */ +@Deprecated public abstract class NavigationTreeSelectionAdapterWithCardLayout extends NavigationTreeSelectionAdapter {

1 0

r1548 - trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation
by tchemit＠users.nuiton.org 03 Oct '09

03 Oct '09

Author: tchemit Date: 2009-10-03 20:22:57 +0200 (Sat, 03 Oct 2009) New Revision: 1548 Modified: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeModelBuilder.java Log: improve api + add javadoc Modified: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeModelBuilder.java =================================================================== --- trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeModelBuilder.java 2009-10-03 18:17:23 UTC (rev 1547) +++ trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeModelBuilder.java 2009-10-03 18:22:57 UTC (rev 1548) @@ -1,15 +1,34 @@ package jaxx.runtime.swing.navigation; +import java.util.Enumeration; import jaxx.runtime.Decorator; import jaxx.runtime.JAXXAction; +import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXContextEntryDef; import jaxx.runtime.JAXXObject; import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode; import jaxx.runtime.swing.navigation.NavigationUtil.NodeRenderer; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; -/** @author chemit */ +/** + * This object is design to build a {@link NavigationTreeModel}. + * + * + * @author chemit + */ public class NavigationTreeModelBuilder { + /** + * Logger + */ + static private final Log log = LogFactory.getLog(NavigationTreeModelBuilder.class); + /** + * The model deal by the builder. + * + * <b>Note:</b> It is a good idea to keep only one instance of the model. + * If reset is required, should empty the model but not reinstanciate it. + */ protected NavigationTreeModel model; public NavigationTreeModelBuilder(String navigationSeparator) { @@ -20,58 +39,63 @@ return model; } + public NavigationTreeNode buildEmptyRoot(JAXXContextEntryDef<?> entryDef, String contextName) { + NavigationTreeNode node = model.new NavigationTreeNode(new NodeRenderer(""), entryDef, null, contextName, null, null); + return addChildNode(null, node); + } + public NavigationTreeNode build(NavigationTreeNode parentNode, String libelle, - JAXXContextEntryDef entryDef, - String entryPath, - String contextName, - Class<? extends JAXXObject> uiClass, - Class<? extends JAXXAction> actionClass) { + JAXXContextEntryDef<?> entryDef, + String entryPath, + String contextName, + Class<? extends JAXXObject> uiClass, + Class<? extends JAXXAction> actionClass) { NavigationTreeNode node = model.new NavigationTreeNode(new NodeRenderer(libelle), entryDef, entryPath, contextName, uiClass, actionClass); return addChildNode(parentNode, node); } public NavigationTreeNode build(NavigationTreeNode parentNode, String libelle, - JAXXContextEntryDef entryDef, - String contextName, - Class<? extends JAXXObject> uiClass, - Class<? extends JAXXAction> actionClass) { + JAXXContextEntryDef<?> entryDef, + String contextName, + Class<? extends JAXXObject> uiClass, + Class<? extends JAXXAction> actionClass) { NavigationTreeNode node = model.new NavigationTreeNode(new NodeRenderer(libelle), entryDef, contextName, uiClass, actionClass); return addChildNode(parentNode, node); } public NavigationTreeNode build(NavigationTreeNode parentNode, String libelle, - String entryPath, - String contextName, - Class<? extends JAXXObject> uiClass, - Class<? extends JAXXAction> actionClass) { + String entryPath, + String contextName, + Class<? extends JAXXObject> uiClass, + Class<? extends JAXXAction> actionClass) { NavigationTreeNode node = model.new NavigationTreeNode(new NodeRenderer(libelle), entryPath, contextName, uiClass, actionClass); return addChildNode(parentNode, node); } public NavigationTreeNode build(NavigationTreeNode parentNode, Decorator<?> decorator, - JAXXContextEntryDef entryDef, - String entryPath, - String contextName, - Class<? extends JAXXObject> uiClass, - Class<? extends JAXXAction> actionClass) { + JAXXContextEntryDef<?> entryDef, + String entryPath, + String contextName, + Class<? extends JAXXObject> uiClass, + Class<? extends JAXXAction> actionClass) { NavigationTreeNode node = model.new NavigationTreeNode(new NodeRenderer(decorator), entryDef, entryPath, contextName, uiClass, actionClass); return addChildNode(parentNode, node); } public NavigationTreeNode build(NavigationTreeNode parentNode, Decorator<?> decorator, - JAXXContextEntryDef entryDef, - String contextName, - Class<? extends JAXXObject> uiClass, - Class<? extends JAXXAction> actionClass) { + JAXXContextEntryDef<?> entryDef, + String contextName, + Class<? extends JAXXObject> uiClass, + Class<? extends JAXXAction> actionClass) { NavigationTreeNode node = model.new NavigationTreeNode(new NodeRenderer(decorator), entryDef, contextName, uiClass, actionClass); return addChildNode(parentNode, node); } public NavigationTreeNode build(NavigationTreeNode parentNode, Decorator<?> decorator, - String entryPath, - String contextName, - Class<? extends JAXXObject> uiClass, - Class<? extends JAXXAction> actionClass) { + String entryPath, + String contextName, + Class<? extends JAXXObject> uiClass, + Class<? extends JAXXAction> actionClass) { NavigationTreeNode node = model.new NavigationTreeNode(new NodeRenderer(decorator), entryPath, contextName, uiClass, actionClass); return addChildNode(parentNode, node); } @@ -92,6 +116,41 @@ return parentNode; } + public void finalizeModel(NavigationTreeNode node, Class<? extends JAXXObject> defaultUIClass, Class<? extends JAXXAction> defaultUIHandlerClass) { + if (node == null) { + return; + } + if (node.getJaxxClass() == null) { + // no ui is associated with this node, display a empty content + node.setJaxxClass(defaultUIClass); + } + + if (node.getJaxxActionClass() == null) { + node.setJaxxActionClass(defaultUIHandlerClass); + } + Enumeration<?> children = node.children(); + while (children.hasMoreElements()) { + finalizeModel((NavigationTreeNode) children.nextElement(), defaultUIClass, defaultUIHandlerClass); + } + + } + + public void printModel(JAXXContext context, NavigationTreeNode node) { + if (node == null) { + return; + } + log.info("node " + node.getContextPath() + ", jxpath: " + node.getJaxxContextEntryPath() + ", entryContextDef: " + node.getJaxxContextEntryDef()); + if (log.isDebugEnabled()) { + log.debug("node userObject" + node.getUserObject()); + log.debug("value from node " + node.getJAXXContextValue(context)); + log.debug("value from model " + model.getJAXXContextValue(context, node)); + } + Enumeration<?> children = node.children(); + while (children.hasMoreElements()) { + printModel(context, (NavigationTreeNode) children.nextElement()); + } + } + public static abstract class ChildBuilder<O> { protected NavigationTreeModelBuilder builder; @@ -148,5 +207,4 @@ } } } - }

1 0

r1547 - trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation
by tchemit＠users.nuiton.org 03 Oct '09

03 Oct '09

Author: tchemit Date: 2009-10-03 20:17:23 +0200 (Sat, 03 Oct 2009) New Revision: 1547 Modified: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeCellRenderer.java Log: improve api + add javadoc Modified: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeCellRenderer.java =================================================================== --- trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeCellRenderer.java 2009-10-03 08:45:25 UTC (rev 1546) +++ trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeCellRenderer.java 2009-10-03 18:17:23 UTC (rev 1547) @@ -16,38 +16,55 @@ import java.awt.Dimension; /** - * A simple cell renderer which use the {@link NavigationTreeNode#renderer} to display node. + * A simple cell renderer which use the {@link NavigationTreeNode#renderer} + * to display node. * * @author chemit */ public class NavigationTreeCellRenderer implements TreeCellRenderer { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** + * Logger + */ static private final Log log = LogFactory.getLog(NavigationTreeCellRenderer.class); - + /** + * underlying context where to seek datas + */ protected JAXXContext context; - + /** + * delegate renderer which really render the node + */ protected DefaultTreeCellRenderer delegate; - protected static long t = 0; - + /** + * If set, will check to have a this minimum width on render component + * to fix some display issues of nodes (too much cache in TreeUI). + */ protected Integer minWidth = null; public NavigationTreeCellRenderer(JAXXContext context) { - this.context = context; - UIManager.put("Tree.rendererFillBackground", false); - delegate = new DefaultTreeCellRenderer(); + this(context, null, null); } + public NavigationTreeCellRenderer(JAXXContext context, Integer minWidth) { + this(context, null, minWidth); + } + public NavigationTreeCellRenderer(JAXXContext context, DefaultTreeCellRenderer delegate) { + this(context, delegate, null); + } + + public NavigationTreeCellRenderer(JAXXContext context, DefaultTreeCellRenderer delegate, Integer minWidth) { this.context = context; - this.delegate = delegate; + this.delegate = delegate == null ? new DefaultTreeCellRenderer() : delegate; + this.minWidth = minWidth; + UIManager.put("Tree.rendererFillBackground", false); } @Override public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) { Component result = delegate; - + TreePath path = tree.getPathForRow(row); if (path != null) { @@ -66,10 +83,9 @@ result = delegate.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); } - if (minWidth != null){ + if (minWidth != null) { if (delegate.getPreferredSize().getWidth() < minWidth) { - delegate.setPreferredSize(new Dimension(minWidth, (int) delegate - .getPreferredSize().getHeight())); + delegate.setPreferredSize(new Dimension(minWidth, (int) delegate.getPreferredSize().getHeight())); } } @@ -113,7 +129,7 @@ * This hack remove the ... from the node. For not use this, MinWidth can be null (by default). * bugfix from http://forums.sun.com/thread.jspa?forumID=256&threadID=277338 * hack from : http://forums.sun.com/thread.jspa?threadID=542069&tstart=824 - * @param min width to decorate nodes + * @param minWidth minimum width to decorate nodes */ public void setMinWidth(Integer minWidth) { this.minWidth = minWidth;

1 0

r1546 - trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime
by tchemit＠users.nuiton.org 03 Oct '09

03 Oct '09

Author: tchemit Date: 2009-10-03 10:45:25 +0200 (Sat, 03 Oct 2009) New Revision: 1546 Modified: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/SwingUtil.java Log: add expandTree method to expand all nodes of a tree Modified: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/SwingUtil.java =================================================================== --- trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/SwingUtil.java 2009-10-02 09:28:22 UTC (rev 1545) +++ trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/SwingUtil.java 2009-10-03 08:45:25 UTC (rev 1546) @@ -46,6 +46,7 @@ import javax.swing.JList; import javax.swing.JRootPane; import javax.swing.JTabbedPane; +import javax.swing.JTree; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.event.HyperlinkEvent; @@ -736,4 +737,22 @@ } } } + + /** + * Expand all childs of a tree. + * + * @param tree the tree to expand + */ + public static void expandTree(final JTree tree) { + SwingUtilities.invokeLater(new Runnable() { + + @Override + public void run() { + int i = 0; + while (i < tree.getRowCount()) { + tree.expandRow(i++); + } + } + }); + } }

1 0

r1545 - in trunk: jaxx-example/src/main/java/jaxx/demo jaxx-runtime-swing/src/main/java/jaxx/runtime/swing
by sletellier＠users.nuiton.org 02 Oct '09

02 Oct '09

Author: sletellier Date: 2009-10-02 11:28:22 +0200 (Fri, 02 Oct 2009) New Revision: 1545 Modified: trunk/jaxx-example/src/main/java/jaxx/demo/ExempleItemTreeNavigationAdapter.java trunk/jaxx-example/src/main/java/jaxx/demo/ItemTreeNavigationDemo.jaxx trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXComboBox.java trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXList.java Log: Beans can be updated in ItemTreeNavigationDemo Modified: trunk/jaxx-example/src/main/java/jaxx/demo/ExempleItemTreeNavigationAdapter.java =================================================================== --- trunk/jaxx-example/src/main/java/jaxx/demo/ExempleItemTreeNavigationAdapter.java 2009-10-01 20:54:16 UTC (rev 1544) +++ trunk/jaxx-example/src/main/java/jaxx/demo/ExempleItemTreeNavigationAdapter.java 2009-10-02 09:28:22 UTC (rev 1545) @@ -1,8 +1,12 @@ package jaxx.demo; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.Date; import jaxx.runtime.JAXXObject; +import jaxx.runtime.swing.Item; import jaxx.runtime.swing.JAXXTree; +import jaxx.runtime.swing.JAXXTree.JAXXTreeModel; import jaxx.runtime.swing.navigation.ItemNavigationCardPanel; import jaxx.runtime.swing.navigation.ItemTreeNavigationAdapter; @@ -12,13 +16,37 @@ */ public class ExempleItemTreeNavigationAdapter extends ItemTreeNavigationAdapter{ + Item currentItem = null; + public ExempleItemTreeNavigationAdapter(JAXXObject context, JAXXTree tree, ItemNavigationCardPanel cardPanel){ super(context, tree, cardPanel); + + ItemTreeNavigationDemo demo = (ItemTreeNavigationDemo)context; + demo.addPropertyChangeListener("date", new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (currentItem != null && !(currentItem.getValue() instanceof Class)){ + currentItem.setValue((Date)evt.getNewValue()); + } + } + }); + + demo.addPropertyChangeListener("string", new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (currentItem != null && !(currentItem.getValue() instanceof Class)){ + currentItem.setValue((String)evt.getNewValue()); + } + } + }); } @Override protected void valueChanged(Object data) { ItemTreeNavigationDemo demo = (ItemTreeNavigationDemo)context; + currentItem = ((JAXXTreeModel)tree.getModel()).findItem(data); if (data instanceof String){ demo.setString((String)data); } else if (data instanceof Date){ Modified: trunk/jaxx-example/src/main/java/jaxx/demo/ItemTreeNavigationDemo.jaxx =================================================================== --- trunk/jaxx-example/src/main/java/jaxx/demo/ItemTreeNavigationDemo.jaxx 2009-10-01 20:54:16 UTC (rev 1544) +++ trunk/jaxx-example/src/main/java/jaxx/demo/ItemTreeNavigationDemo.jaxx 2009-10-02 09:28:22 UTC (rev 1545) @@ -30,10 +30,10 @@ <ItemNavigationCardPanel id="content">  <ItemNavigationPanel id='stringPanel' constructorParams='String.class' layout='{new FlowLayout()}'> - <JTextField text='{getString()}'/> + <JTextField id='stringTextField' text='{getString()}' onKeyReleased='setString(stringTextField.getText())'/> </ItemNavigationPanel> <ItemNavigationPanel id='datePanel' constructorParams='Date.class' layout='{new FlowLayout()}'> - <JXDatePicker date='{getDate()}'/> + <JXDatePicker id='datePicker' date='{getDate()}' onActionPerformed='setDate(datePicker.getDate())'/> </ItemNavigationPanel> </ItemNavigationCardPanel> </JSplitPane> Modified: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXComboBox.java =================================================================== --- trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXComboBox.java 2009-10-01 20:54:16 UTC (rev 1544) +++ trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXComboBox.java 2009-10-02 09:28:22 UTC (rev 1545) @@ -68,7 +68,9 @@ System.arraycopy(oldSelection, 0, newSelection, 0, index); System.arraycopy(oldSelection, index + 1, newSelection, index, oldSelection.length - 1 - index); } - setSelectedIndex(newSelection[0]); + if (newSelection.length > 0){ + setSelectedIndex(newSelection[0]); + } } else { // TODO: more cut-and-pasting badness for (int i = 0; i < getSize(); i++) { Modified: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXList.java =================================================================== --- trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXList.java 2009-10-01 20:54:16 UTC (rev 1544) +++ trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXList.java 2009-10-02 09:28:22 UTC (rev 1545) @@ -203,14 +203,16 @@ } public void setSelectedItems(List<Item> itemsToSelect) { - List<Item> items = getItems(); - int[] indices = new int[itemsToSelect.size()]; - int i = 0; - for (Item item : itemsToSelect){ - indices[i] = items.indexOf(item); - i++; + if (itemsToSelect != null){ + List<Item> items = getItems(); + int[] indices = new int[itemsToSelect.size()]; + int i = 0; + for (Item item : itemsToSelect){ + indices[i] = items.indexOf(item); + i++; + } + super.setSelectedIndices(indices); } - super.setSelectedIndices(indices); } public Item getSelectedItem(){

1 0

r1544 - trunk/jaxx-example
by tchemit＠users.nuiton.org 01 Oct '09

01 Oct '09

Author: tchemit Date: 2009-10-01 22:54:16 +0200 (Thu, 01 Oct 2009) New Revision: 1544 Modified: trunk/jaxx-example/pom.xml Log: simplification de la configuration webstart (voir mavenpom) Modified: trunk/jaxx-example/pom.xml =================================================================== --- trunk/jaxx-example/pom.xml 2009-10-01 13:36:43 UTC (rev 1543) +++ trunk/jaxx-example/pom.xml 2009-10-01 20:54:16 UTC (rev 1544) @@ -67,17 +67,6 @@ <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> - -  - <keystorepath>${nuiton.keystorepath}</keystorepath> - <keystorealias>${nuiton.keystorealias}</keystorealias> - <keystorepass>${nuiton.keystorepass}</keystorepass> - - <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory> - - <jnlp.url>${project.url}</jnlp.url> -  - </properties> <build> @@ -111,54 +100,32 @@ </archive> </configuration> </plugin> - + <plugin> <groupId>org.nuiton.thirdparty</groupId> <artifactId>webstart-maven-plugin</artifactId> - <version>1.0-alpha-2-cl_20090204</version> <configuration> - <force>false</force> - <dependencies> - <excludes> - <exclude>javax.help:javahelp</exclude> - <exclude>org.swinglabs:jxlayer</exclude> - </excludes> - </dependencies> - <libPath>lib</libPath> - <extensions> - <sun>sun.jnlp</sun> - <jxlayer>jxlayer.jnlp</jxlayer> - </extensions> - <jnlp> - <outputFile>launch-demo.jnlp</outputFile> - <mainClass>${maven.jar.main.class}</mainClass> - <allPermissions>true</allPermissions> - <offlineAllowed>true</offlineAllowed> - </jnlp> - - <sign> - <keystore>${keystorepath}</keystore> - <keypass /> - <storepass>${keystorepass}</storepass> - <storetype /> - <alias>${keystorealias}</alias> - <validity /> - <dnameCn /> - <dnameOu /> - <dnameO /> - <dnameL /> - <dnameSt /> - <dnameC /> - <verify>true</verify> - <keystoreConfig> - <delete>false</delete> - <gen>false</gen> - </keystoreConfig> - </sign> - - <pack200>false</pack200> - <gzip>true</gzip> - <verbose>false</verbose> + <jnlpExtensions> + <jnlpExtension> + <name>sun</name> + <title>Sun MicroSystems</title> + <vendor>Sun MicroSystems, Inc.</vendor> + <includes> + <include>javax.help:javahelp</include> + </includes> + </jnlpExtension> + <jnlpExtension> + <name>jxlayer</name> + <title>Swing labs JXLayer </title> + <vendor>Swing Labs</vendor> + <includes> + <include>org.swinglabs:jxlayer</include> + </includes> + </jnlpExtension> + </jnlpExtensions> +  </configuration> </plugin> @@ -204,15 +171,18 @@ </executions> </plugin> + </plugins> + </build> + + <reporting> + <plugins> <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <configuration> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </configuration> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>1.0-alpha-2-cl_20091001</version> </plugin> - </plugins> - </build> + </reporting>   @@ -230,90 +200,46 @@ </activation> <build> <plugins> +  <plugin> - - <artifactId>maven-antrun-plugin</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>${helper.version}</version> <executions> -  <execution> - <id>JnlpSun</id> - <phase>verify</phase> - <configuration> - <tasks> - <mkdir dir="${jnlp.build.directory}" /> - <copy file="${project.basedir}/src/main/jnlp/sun.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false"> - <filterset> - <filter token="lib" value="javahelp-${javahelp.version}.jar" /> - <filter token="url" value="${jnlp.url}" /> - </filterset> - </copy> - <copy file="${project.basedir}/src/main/jnlp/jxlayer.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false"> - <filterset> - <filter token="lib" value="jxlayer-${jxlayer.version}.jar" /> - <filter token="url" value="${jnlp.url}" /> - </filterset> - </copy> - <copy file="${project.build.directory}/lib/javahelp-${javahelp.version}.jar" verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" failonerror="false" /> - <copy file="${project.build.directory}/lib/jxlayer-${jxlayer.version}.jar" verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" failonerror="false" /> - </tasks> - </configuration> + <id>get-jnlp-keystore</id> <goals> - <goal>run</goal> + <goal>share-server-secret</goal> </goals> - </execution> - - <execution> - <id>JnlpToSite</id> - <phase>pre-site</phase> + <phase>package</phase> <configuration> - <tasks> - <mkdir dir="target/site" /> - <copy todir="target/site" verbose="${maven.verbose}" failonerror="false" overwrite="false"> - <fileset dir="${jnlp.build.directory}"> - <include name="**" /> - </fileset> - </copy> - </tasks> + <serverId>codelutin-keystore</serverId> + <usernameOut>keystorepath</usernameOut> + <passwordOut>keystorepass</passwordOut> </configuration> - <goals> - <goal>run</goal> - </goals> </execution> - </executions> - </plugin> - <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <executions> <execution> - <phase>package</phase> + <id>get-jnlp-key</id> <goals> - <goal>jnlp-inline</goal> + <goal>share-server-secret</goal> </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore-nuiton-key</serverId> + <usernameOut>keyalias</usernameOut> + <passwordOut>keypass</passwordOut> + </configuration> </execution> </executions> </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>webstart-profile</id> - <activation> - <property> - <name>doWebstart</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - + +  <plugin> <groupId>org.nuiton.thirdparty</groupId> <artifactId>webstart-maven-plugin</artifactId> <executions> <execution> + <id>generate-jnlp</id> <phase>package</phase> <goals> <goal>jnlp-inline</goal> @@ -321,59 +247,6 @@ </execution> </executions> </plugin> - - <plugin> - - <artifactId>maven-antrun-plugin</artifactId> - <executions> -  - <execution> - <id>JnlpSun</id> - <phase>verify</phase> - <configuration> - <tasks> - <mkdir dir="${jnlp.build.directory}" /> - <copy file="${project.basedir}/src/main/jnlp/sun.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false"> - <filterset> - <filter token="lib" value="javahelp-${javahelp.version}.jar" /> - <filter token="url" value="${jnlp.url}" /> - </filterset> - </copy> - <copy file="${project.basedir}/src/main/jnlp/jxlayer.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false"> - <filterset> - <filter token="lib" value="jxlayer-${jxlayer.version}.jar" /> - <filter token="url" value="${jnlp.url}" /> - </filterset> - </copy> - <copy file="${project.build.directory}/lib/javahelp-${javahelp.version}.jar" verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" failonerror="false" /> - <copy file="${project.build.directory}/lib/jxlayer-${jxlayer.version}.jar" verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" failonerror="false" /> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - - <execution> - <id>JnlpToSite</id> - <phase>pre-site</phase> - <configuration> - <tasks> - <mkdir dir="target/site" /> - <copy todir="target/site" verbose="${maven.verbose}" failonerror="false" overwrite="false"> - <fileset dir="${jnlp.build.directory}"> - <include name="**" /> - </fileset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> </build> </profile>

1 0

r1543 - trunk/jaxx-example/src/main/java/jaxx/demo
by sletellier＠users.nuiton.org 01 Oct '09

01 Oct '09

Author: sletellier Date: 2009-10-01 15:36:43 +0200 (Thu, 01 Oct 2009) New Revision: 1543 Modified: trunk/jaxx-example/src/main/java/jaxx/demo/ItemTreeNavigationDemo.jaxx Log: Ajout d'un systeme d'arbre de navigation base sur les items Modified: trunk/jaxx-example/src/main/java/jaxx/demo/ItemTreeNavigationDemo.jaxx =================================================================== --- trunk/jaxx-example/src/main/java/jaxx/demo/ItemTreeNavigationDemo.jaxx 2009-10-01 13:31:44 UTC (rev 1542) +++ trunk/jaxx-example/src/main/java/jaxx/demo/ItemTreeNavigationDemo.jaxx 2009-10-01 13:36:43 UTC (rev 1543) @@ -26,7 +26,9 @@ </item> </JTree> </JScrollPane> +  <ItemNavigationCardPanel id="content"> +  <ItemNavigationPanel id='stringPanel' constructorParams='String.class' layout='{new FlowLayout()}'> <JTextField text='{getString()}'/> </ItemNavigationPanel>

1 0

r1542 - in trunk: jaxx-example/src/main/java/jaxx/demo jaxx-runtime-swing/src/main/java/jaxx/runtime/swing jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation
by sletellier＠users.nuiton.org 01 Oct '09

01 Oct '09

Author: sletellier Date: 2009-10-01 15:31:44 +0200 (Thu, 01 Oct 2009) New Revision: 1542 Added: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationPanel.java Removed: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/CardLayout3.java Modified: trunk/jaxx-example/src/main/java/jaxx/demo/ExempleItemTreeNavigationAdapter.java trunk/jaxx-example/src/main/java/jaxx/demo/ItemTreeNavigationDemo.jaxx trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXTree.java trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java Log: Ajout d'un systeme d'arbre de navigation base sur les items Modified: trunk/jaxx-example/src/main/java/jaxx/demo/ExempleItemTreeNavigationAdapter.java =================================================================== --- trunk/jaxx-example/src/main/java/jaxx/demo/ExempleItemTreeNavigationAdapter.java 2009-10-01 10:03:15 UTC (rev 1541) +++ trunk/jaxx-example/src/main/java/jaxx/demo/ExempleItemTreeNavigationAdapter.java 2009-10-01 13:31:44 UTC (rev 1542) @@ -18,10 +18,14 @@ @Override protected void valueChanged(Object data) { + ItemTreeNavigationDemo demo = (ItemTreeNavigationDemo)context; if (data instanceof String){ - ((ItemTreeNavigationDemo)context).setString((String)data); + demo.setString((String)data); } else if (data instanceof Date){ - ((ItemTreeNavigationDemo)context).setDate((Date)data); + demo.setDate((Date)data); + } else { + demo.setString(""); + demo.setDate(null); } } Modified: trunk/jaxx-example/src/main/java/jaxx/demo/ItemTreeNavigationDemo.jaxx =================================================================== --- trunk/jaxx-example/src/main/java/jaxx/demo/ItemTreeNavigationDemo.jaxx 2009-10-01 10:03:15 UTC (rev 1541) +++ trunk/jaxx-example/src/main/java/jaxx/demo/ItemTreeNavigationDemo.jaxx 2009-10-01 13:31:44 UTC (rev 1542) @@ -7,25 +7,32 @@ import jaxx.runtime.swing.navigation.*; import org.jdesktop.swingx.JXDatePicker; -new ExempleItemTreeNavigationAdapter(this, nav, content); +void $afterCompleteSetup() { + new ExempleItemTreeNavigationAdapter(this, nav, content); +} </script> <JPanel id='demoPanel' layout='{new BorderLayout()}'> <JSplitPane constraints='BorderLayout.CENTER'> <JScrollPane> <JTree id='nav' rootVisible='{false}'> - <item id='string1Item' label='String1' value='{new String("Ceci est un String")}'/> - <item id='string2Item' label='String2' value='{new String("Celui-ci un autre")}'/> - <item id='dateItem' label='Date' value='{new Date()}'/> +  + <item id='stringItemParent' label='String' value='{String.class}'> + <item id='string1Item' label='String1' value='{new String("Ceci est un String")}' selected='true'/> + <item id='string2Item' label='String2' value='{new String("Celui-ci un autre")}'/> + </item> + <item id='dateItemParent' label='Date' value='{Date.class}'> + <item id='dateItem' label='CurrentDate' value='{new Date()}'/> + </item> </JTree> </JScrollPane> <ItemNavigationCardPanel id="content"> - <JPanel id='stringPanel' constraints='String.class'> + <ItemNavigationPanel id='stringPanel' constructorParams='String.class' layout='{new FlowLayout()}'> <JTextField text='{getString()}'/> - </JPanel> - <JPanel id='datePanel' constraints='Date.class'> + </ItemNavigationPanel> + <ItemNavigationPanel id='datePanel' constructorParams='Date.class' layout='{new FlowLayout()}'> <JXDatePicker date='{getDate()}'/> - </JPanel> + </ItemNavigationPanel> </ItemNavigationCardPanel> </JSplitPane> </JPanel> Deleted: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/CardLayout3.java =================================================================== --- trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/CardLayout3.java 2009-10-01 10:03:15 UTC (rev 1541) +++ trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/CardLayout3.java 2009-10-01 13:31:44 UTC (rev 1542) @@ -1,301 +0,0 @@ -package jaxx.runtime.swing; - -import java.awt.CardLayout; -import java.awt.Component; -import java.awt.Container; -import java.io.Serializable; -import java.util.Vector; - -/** - * An override of the awt {@link java.awt.CardLayout}. - * <p/> - * Because in the original layout is not overridable : everything is package level accessible. - * <p/> - * This new class allow using Object for constrains, and not only String - * - * @author letellier - * @version 1.0 - */ -public class CardLayout3 extends CardLayout{ - - /* - * Index of Component currently displayed by CardLayout. - */ - int currentCard = 0; - - /* - * This creates a Vector to store associated - * pairs of components and their names. - * @see java.util.Vector - */ - Vector vector = new Vector(); - - /* - * A pair of Component and String that represents its name. - */ - class Card implements Serializable { - static final long serialVersionUID = 6640330810709497518L; - public Object constraint; - public Component comp; - public Card(Object constraint, Component cardComponent) { - this.constraint = constraint; - this.comp = cardComponent; - } - } - - /** - * Creates a new card layout with gaps of size zero. - */ - public CardLayout3() { - this(0, 0); - } - - /** - * Creates a new card layout with the specified horizontal and - * vertical gaps. The horizontal gaps are placed at the left and - * right edges. The vertical gaps are placed at the top and bottom - * edges. - * @param hgap the horizontal gap. - * @param vgap the vertical gap. - */ - public CardLayout3(int hgap, int vgap) { - super(hgap,vgap); - } - - /** - * Adds the specified component to this card layout's internal - * table of names. The object specified by <code>constraints</code> - * must be a string. The card layout stores this string as a key-value - * pair that can be used for random access to a particular card. - * By calling the <code>show</code> method, an application can - * display the component with the specified name. - * @param comp the component to be added. - * @param constraints a tag that identifies a particular - * card in the layout. - * @see java.awt.CardLayout#show(java.awt.Container, java.lang.String) - * @exception IllegalArgumentException if the constraint is not a string. - */ - @Override - public void addLayoutComponent(Component comp, Object constraints) { - synchronized (comp.getTreeLock()) { - if (constraints instanceof String) { - addLayoutComponent((String)constraints, comp); - } else { - addLayoutComponent(constraints, comp); - } - } - } - - /** - * <code>addLayoutComponent(Component, Object)</code>. - */ - public void addLayoutComponent(Object constraint, Component comp) { - synchronized (comp.getTreeLock()) { - if (constraint == null){ - throw new IllegalArgumentException("cannot add to layout: constraint cannot be null"); - } - if (!vector.isEmpty()) { - comp.setVisible(false); - } - for (int i=0; i < vector.size(); i++) { - if (((Card)vector.get(i)).constraint.equals(constraint)) { - ((Card)vector.get(i)).comp = comp; - return; - } - } - vector.add(new Card(constraint, comp)); - } - } - - /** - * Removes the specified component from the layout. - * If the card was visible on top, the next card underneath it is shown. - * @param comp the component to be removed. - * @see java.awt.Container#remove(java.awt.Component) - * @see java.awt.Container#removeAll() - */ - @Override - public void removeLayoutComponent(Component comp) { - synchronized (comp.getTreeLock()) { - for (int i = 0; i < vector.size(); i++) { - if (((Card)vector.get(i)).comp == comp) { - // if we remove current component we should show next one - if (comp.isVisible() && (comp.getParent() != null)) { - next(comp.getParent()); - } - - vector.remove(i); - - // correct currentCard if this is necessary - if (currentCard > i) { - currentCard--; - } - break; - } - } - } - } - - /** - * Flips to the first card of the container. - * @param parent the parent container in which to do the layout - * @see java.awt.CardLayout#last - */ - @Override - public void first(Container parent) { - synchronized (parent.getTreeLock()) { - checkLayout(parent); - int ncomponents = parent.getComponentCount(); - for (int i = 0 ; i < ncomponents ; i++) { - Component comp = parent.getComponent(i); - if (comp.isVisible()) { - comp.setVisible(false); - break; - } - } - if (ncomponents > 0) { - currentCard = 0; - parent.getComponent(0).setVisible(true); - parent.validate(); - } - } - } - - /** - * Flips to the next card of the specified container. If the - * currently visible card is the last one, this method flips to the - * first card in the layout. - * @param parent the parent container in which to do the layout - * @see java.awt.CardLayout#previous - */ - @Override - public void next(Container parent) { - synchronized (parent.getTreeLock()) { - checkLayout(parent); - int ncomponents = parent.getComponentCount(); - for (int i = 0 ; i < ncomponents ; i++) { - Component comp = parent.getComponent(i); - if (comp.isVisible()) { - comp.setVisible(false); - currentCard = (i + 1) % ncomponents; - comp = parent.getComponent(currentCard); - comp.setVisible(true); - parent.validate(); - return; - } - } - showDefaultComponent(parent); - } - } - - /** - * Flips to the previous card of the specified container. If the - * currently visible card is the first one, this method flips to the - * last card in the layout. - * @param parent the parent container in which to do the layout - * @see java.awt.CardLayout#next - */ - @Override - public void previous(Container parent) { - synchronized (parent.getTreeLock()) { - checkLayout(parent); - int ncomponents = parent.getComponentCount(); - for (int i = 0 ; i < ncomponents ; i++) { - Component comp = parent.getComponent(i); - if (comp.isVisible()) { - comp.setVisible(false); - currentCard = ((i > 0) ? i-1 : ncomponents-1); - comp = parent.getComponent(currentCard); - comp.setVisible(true); - parent.validate(); - return; - } - } - showDefaultComponent(parent); - } - } - - void showDefaultComponent(Container parent) { - if (parent.getComponentCount() > 0) { - currentCard = 0; - parent.getComponent(0).setVisible(true); - parent.validate(); - } - } - - /** - * Flips to the last card of the container. - * @param parent the parent container in which to do the layout - * @see java.awt.CardLayout#first - */ - @Override - public void last(Container parent) { - synchronized (parent.getTreeLock()) { - checkLayout(parent); - int ncomponents = parent.getComponentCount(); - for (int i = 0 ; i < ncomponents ; i++) { - Component comp = parent.getComponent(i); - if (comp.isVisible()) { - comp.setVisible(false); - break; - } - } - if (ncomponents > 0) { - currentCard = ncomponents - 1; - parent.getComponent(currentCard).setVisible(true); - parent.validate(); - } - } - } - - /** - * Flips to the component that was added to this layout with the - * specified <code>name</code>, using <code>addLayoutComponent</code>. - * If no such component exists, then nothing happens. - * @param parent the parent container in which to do the layout - * @param name the component name - * @see java.awt.CardLayout#addLayoutComponent(java.awt.Component, java.lang.Object) - */ - public void show(Container parent, Object constraint) { - synchronized (parent.getTreeLock()) { - checkLayout(parent); - Component next = null; - int ncomponents = vector.size(); - for (int i = 0; i < ncomponents; i++) { - Card card = (Card)vector.get(i); - if (card.constraint.equals(constraint)) { - next = card.comp; - currentCard = i; - break; - } - } - if ((next != null) && !next.isVisible()) { - ncomponents = parent.getComponentCount(); - for (int i = 0; i < ncomponents; i++) { - Component comp = parent.getComponent(i); - if (comp.isVisible()) { - comp.setVisible(false); - break; - } - } - next.setVisible(true); - parent.validate(); - } - } - } - - public Component getShowedComponent(Container parent){ - return parent.getComponent(currentCard); - } - - /** - * Make sure that the Container really has a CardLayout installed. - * Otherwise havoc can ensue! - */ - void checkLayout(Container parent) { - if (parent.getLayout() != this) { - throw new IllegalArgumentException("wrong parent for CardLayout"); - } - } - -} Modified: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXTree.java =================================================================== --- trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXTree.java 2009-10-01 10:03:15 UTC (rev 1541) +++ trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXTree.java 2009-10-01 13:31:44 UTC (rev 1542) @@ -219,11 +219,24 @@ } public void setItems(List<Item> items) { + // Create model JAXXTreeModel model = new JAXXTreeModel(items); if (model.getRoot() != null) { setRootVisible(model.getRoot() != SYNTHETIC); } + // Atach model setModel(model); + + // Appli selected items + if (items != null){ + List<TreePath> treePathSelected = new ArrayList<TreePath>(); + for (Item i : items){ + if (i.isSelected()){ + treePathSelected.add(model.getTreePath(i)); + } + } + this.setSelectionPaths(convertToTreePathArray(treePathSelected.toArray())); + } } public Object getSelectionValue() { @@ -238,4 +251,9 @@ return null; } + protected TreePath[] convertToTreePathArray(Object[] datas){ + TreePath[] params = new TreePath[datas.length]; + System.arraycopy(datas, 0, params, 0, datas.length); + return params; + } } Modified: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java =================================================================== --- trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java 2009-10-01 10:03:15 UTC (rev 1541) +++ trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java 2009-10-01 13:31:44 UTC (rev 1542) @@ -5,9 +5,9 @@ package jaxx.runtime.swing.navigation; +import java.awt.CardLayout; import java.awt.Component; import javax.swing.JPanel; -import jaxx.runtime.swing.CardLayout3; import jaxx.runtime.swing.Item; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -21,20 +21,46 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private final Log log = LogFactory.getLog(ItemNavigationCardPanel.class); - CardLayout3 layout; + private static final long serialVersionUID = 1L; + + CardLayout layout; public ItemNavigationCardPanel(){ super(); - layout = new CardLayout3(); + + layout = new CardLayout(); setLayout(layout); } public void showItem(Item i){ if (i != null && i.getValue() != null){ - layout.show(this, i.getValue().getClass()); + if (i.getValue() instanceof Class){ + layout.show(this, i.getValue().getClass().getName()); + } + else { + layout.show(this, i.getValue().getClass().getName()); + } } } public Component getShowedComponent(){ - return layout.getShowedComponent(this); + Component[] components = getComponents(); + if (components != null){ + for (Component c : components){ + if (c.isVisible()){ + return c; + } + } + } + return null; } + + @Override + public Component add(Component comp) { + if (!(comp instanceof ItemNavigationPanel)){ + throw new IllegalArgumentException("ItemNavigationCardPanel must be have only ItemNavigationPanel children"); + } + super.add(comp, ((ItemNavigationPanel)comp).getAssociatedClass().getName()); + return comp; + } + } Added: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationPanel.java =================================================================== --- trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationPanel.java (rev 0) +++ trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationPanel.java 2009-10-01 13:31:44 UTC (rev 1542) @@ -0,0 +1,28 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package jaxx.runtime.swing.navigation; + +import javax.swing.JPanel; + +/** + * + * @author letellier + */ +public class ItemNavigationPanel extends JPanel{ + + private static final long serialVersionUID = 1L; + + protected Class associatedClass = null; + + public ItemNavigationPanel(Class associatedClass) { + this.associatedClass = associatedClass; + } + + public Class getAssociatedClass() { + return associatedClass; + } + +}

1 0

r1541 - in trunk: jaxx-example/src/main/java/jaxx/demo jaxx-runtime-swing/src/main/java/jaxx/runtime/swing jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation
by sletellier＠users.nuiton.org 01 Oct '09

01 Oct '09

Author: sletellier Date: 2009-10-01 12:03:15 +0200 (Thu, 01 Oct 2009) New Revision: 1541 Added: trunk/jaxx-example/src/main/java/jaxx/demo/ExempleItemTreeNavigationAdapter.java trunk/jaxx-example/src/main/java/jaxx/demo/ItemTreeNavigationDemo.jaxx trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/CardLayout3.java trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/ItemTreeNavigationAdapter.java Modified: trunk/jaxx-example/src/main/java/jaxx/demo/JAXXDemo.jaxx Log: Ajout d'un systeme d'arbre de navigation base sur les items Added: trunk/jaxx-example/src/main/java/jaxx/demo/ExempleItemTreeNavigationAdapter.java =================================================================== --- trunk/jaxx-example/src/main/java/jaxx/demo/ExempleItemTreeNavigationAdapter.java (rev 0) +++ trunk/jaxx-example/src/main/java/jaxx/demo/ExempleItemTreeNavigationAdapter.java 2009-10-01 10:03:15 UTC (rev 1541) @@ -0,0 +1,28 @@ +package jaxx.demo; + +import java.util.Date; +import jaxx.runtime.JAXXObject; +import jaxx.runtime.swing.JAXXTree; +import jaxx.runtime.swing.navigation.ItemNavigationCardPanel; +import jaxx.runtime.swing.navigation.ItemTreeNavigationAdapter; + +/** + * + * @author letellier + */ +public class ExempleItemTreeNavigationAdapter extends ItemTreeNavigationAdapter{ + + public ExempleItemTreeNavigationAdapter(JAXXObject context, JAXXTree tree, ItemNavigationCardPanel cardPanel){ + super(context, tree, cardPanel); + } + + @Override + protected void valueChanged(Object data) { + if (data instanceof String){ + ((ItemTreeNavigationDemo)context).setString((String)data); + } else if (data instanceof Date){ + ((ItemTreeNavigationDemo)context).setDate((Date)data); + } + } + +} Added: trunk/jaxx-example/src/main/java/jaxx/demo/ItemTreeNavigationDemo.jaxx =================================================================== --- trunk/jaxx-example/src/main/java/jaxx/demo/ItemTreeNavigationDemo.jaxx (rev 0) +++ trunk/jaxx-example/src/main/java/jaxx/demo/ItemTreeNavigationDemo.jaxx 2009-10-01 10:03:15 UTC (rev 1541) @@ -0,0 +1,32 @@ +<DemoPanel> + + <String id='string' javaBean='null'/> + <Date id='date' javaBean='null'/> + + <script> +import jaxx.runtime.swing.navigation.*; +import org.jdesktop.swingx.JXDatePicker; + +new ExempleItemTreeNavigationAdapter(this, nav, content); + </script> + + <JPanel id='demoPanel' layout='{new BorderLayout()}'> + <JSplitPane constraints='BorderLayout.CENTER'> + <JScrollPane> + <JTree id='nav' rootVisible='{false}'> + <item id='string1Item' label='String1' value='{new String("Ceci est un String")}'/> + <item id='string2Item' label='String2' value='{new String("Celui-ci un autre")}'/> + <item id='dateItem' label='Date' value='{new Date()}'/> + </JTree> + </JScrollPane> + <ItemNavigationCardPanel id="content"> + <JPanel id='stringPanel' constraints='String.class'> + <JTextField text='{getString()}'/> + </JPanel> + <JPanel id='datePanel' constraints='Date.class'> + <JXDatePicker date='{getDate()}'/> + </JPanel> + </ItemNavigationCardPanel> + </JSplitPane> + </JPanel> +</DemoPanel> \ No newline at end of file Modified: trunk/jaxx-example/src/main/java/jaxx/demo/JAXXDemo.jaxx =================================================================== --- trunk/jaxx-example/src/main/java/jaxx/demo/JAXXDemo.jaxx 2009-09-30 13:40:43 UTC (rev 1540) +++ trunk/jaxx-example/src/main/java/jaxx/demo/JAXXDemo.jaxx 2009-10-01 10:03:15 UTC (rev 1541) @@ -83,6 +83,7 @@ <item value='{validationDemo1}'/> <item value='{validationDemo2}'/> </item> + <item value='{itemTreeNavigationDemo}'/> <item value='{dataBindingDemo}'/> <item value='{boxedDecoratorDemo}'/> <item value='{statusMessagePanelDemo}'/> @@ -118,6 +119,7 @@ <JTextAreaDemo id='textAreaDemo' constraints='textAreaDemo.getLabel()'/> <ValidationListDemo id='validationDemo1' constraints='validationDemo1.getLabel()'/> <ValidationTableDemo id='validationDemo2' constraints='validationDemo2.getLabel()'/> + <ItemTreeNavigationDemo id='itemTreeNavigationDemo' constraints='itemTreeNavigationDemo.getLabel()'/> <BeanDataBindingDemo id='dataBindingDemo' constraints='dataBindingDemo.getLabel()'/> <LabelStyleDemo id='labelStyleDemo' constraints='labelStyleDemo.getLabel()'/> <CounterDemo id='counterDemo' constraints='counterDemo.getLabel()'/> Added: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/CardLayout3.java =================================================================== --- trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/CardLayout3.java (rev 0) +++ trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/CardLayout3.java 2009-10-01 10:03:15 UTC (rev 1541) @@ -0,0 +1,301 @@ +package jaxx.runtime.swing; + +import java.awt.CardLayout; +import java.awt.Component; +import java.awt.Container; +import java.io.Serializable; +import java.util.Vector; + +/** + * An override of the awt {@link java.awt.CardLayout}. + * <p/> + * Because in the original layout is not overridable : everything is package level accessible. + * <p/> + * This new class allow using Object for constrains, and not only String + * + * @author letellier + * @version 1.0 + */ +public class CardLayout3 extends CardLayout{ + + /* + * Index of Component currently displayed by CardLayout. + */ + int currentCard = 0; + + /* + * This creates a Vector to store associated + * pairs of components and their names. + * @see java.util.Vector + */ + Vector vector = new Vector(); + + /* + * A pair of Component and String that represents its name. + */ + class Card implements Serializable { + static final long serialVersionUID = 6640330810709497518L; + public Object constraint; + public Component comp; + public Card(Object constraint, Component cardComponent) { + this.constraint = constraint; + this.comp = cardComponent; + } + } + + /** + * Creates a new card layout with gaps of size zero. + */ + public CardLayout3() { + this(0, 0); + } + + /** + * Creates a new card layout with the specified horizontal and + * vertical gaps. The horizontal gaps are placed at the left and + * right edges. The vertical gaps are placed at the top and bottom + * edges. + * @param hgap the horizontal gap. + * @param vgap the vertical gap. + */ + public CardLayout3(int hgap, int vgap) { + super(hgap,vgap); + } + + /** + * Adds the specified component to this card layout's internal + * table of names. The object specified by <code>constraints</code> + * must be a string. The card layout stores this string as a key-value + * pair that can be used for random access to a particular card. + * By calling the <code>show</code> method, an application can + * display the component with the specified name. + * @param comp the component to be added. + * @param constraints a tag that identifies a particular + * card in the layout. + * @see java.awt.CardLayout#show(java.awt.Container, java.lang.String) + * @exception IllegalArgumentException if the constraint is not a string. + */ + @Override + public void addLayoutComponent(Component comp, Object constraints) { + synchronized (comp.getTreeLock()) { + if (constraints instanceof String) { + addLayoutComponent((String)constraints, comp); + } else { + addLayoutComponent(constraints, comp); + } + } + } + + /** + * <code>addLayoutComponent(Component, Object)</code>. + */ + public void addLayoutComponent(Object constraint, Component comp) { + synchronized (comp.getTreeLock()) { + if (constraint == null){ + throw new IllegalArgumentException("cannot add to layout: constraint cannot be null"); + } + if (!vector.isEmpty()) { + comp.setVisible(false); + } + for (int i=0; i < vector.size(); i++) { + if (((Card)vector.get(i)).constraint.equals(constraint)) { + ((Card)vector.get(i)).comp = comp; + return; + } + } + vector.add(new Card(constraint, comp)); + } + } + + /** + * Removes the specified component from the layout. + * If the card was visible on top, the next card underneath it is shown. + * @param comp the component to be removed. + * @see java.awt.Container#remove(java.awt.Component) + * @see java.awt.Container#removeAll() + */ + @Override + public void removeLayoutComponent(Component comp) { + synchronized (comp.getTreeLock()) { + for (int i = 0; i < vector.size(); i++) { + if (((Card)vector.get(i)).comp == comp) { + // if we remove current component we should show next one + if (comp.isVisible() && (comp.getParent() != null)) { + next(comp.getParent()); + } + + vector.remove(i); + + // correct currentCard if this is necessary + if (currentCard > i) { + currentCard--; + } + break; + } + } + } + } + + /** + * Flips to the first card of the container. + * @param parent the parent container in which to do the layout + * @see java.awt.CardLayout#last + */ + @Override + public void first(Container parent) { + synchronized (parent.getTreeLock()) { + checkLayout(parent); + int ncomponents = parent.getComponentCount(); + for (int i = 0 ; i < ncomponents ; i++) { + Component comp = parent.getComponent(i); + if (comp.isVisible()) { + comp.setVisible(false); + break; + } + } + if (ncomponents > 0) { + currentCard = 0; + parent.getComponent(0).setVisible(true); + parent.validate(); + } + } + } + + /** + * Flips to the next card of the specified container. If the + * currently visible card is the last one, this method flips to the + * first card in the layout. + * @param parent the parent container in which to do the layout + * @see java.awt.CardLayout#previous + */ + @Override + public void next(Container parent) { + synchronized (parent.getTreeLock()) { + checkLayout(parent); + int ncomponents = parent.getComponentCount(); + for (int i = 0 ; i < ncomponents ; i++) { + Component comp = parent.getComponent(i); + if (comp.isVisible()) { + comp.setVisible(false); + currentCard = (i + 1) % ncomponents; + comp = parent.getComponent(currentCard); + comp.setVisible(true); + parent.validate(); + return; + } + } + showDefaultComponent(parent); + } + } + + /** + * Flips to the previous card of the specified container. If the + * currently visible card is the first one, this method flips to the + * last card in the layout. + * @param parent the parent container in which to do the layout + * @see java.awt.CardLayout#next + */ + @Override + public void previous(Container parent) { + synchronized (parent.getTreeLock()) { + checkLayout(parent); + int ncomponents = parent.getComponentCount(); + for (int i = 0 ; i < ncomponents ; i++) { + Component comp = parent.getComponent(i); + if (comp.isVisible()) { + comp.setVisible(false); + currentCard = ((i > 0) ? i-1 : ncomponents-1); + comp = parent.getComponent(currentCard); + comp.setVisible(true); + parent.validate(); + return; + } + } + showDefaultComponent(parent); + } + } + + void showDefaultComponent(Container parent) { + if (parent.getComponentCount() > 0) { + currentCard = 0; + parent.getComponent(0).setVisible(true); + parent.validate(); + } + } + + /** + * Flips to the last card of the container. + * @param parent the parent container in which to do the layout + * @see java.awt.CardLayout#first + */ + @Override + public void last(Container parent) { + synchronized (parent.getTreeLock()) { + checkLayout(parent); + int ncomponents = parent.getComponentCount(); + for (int i = 0 ; i < ncomponents ; i++) { + Component comp = parent.getComponent(i); + if (comp.isVisible()) { + comp.setVisible(false); + break; + } + } + if (ncomponents > 0) { + currentCard = ncomponents - 1; + parent.getComponent(currentCard).setVisible(true); + parent.validate(); + } + } + } + + /** + * Flips to the component that was added to this layout with the + * specified <code>name</code>, using <code>addLayoutComponent</code>. + * If no such component exists, then nothing happens. + * @param parent the parent container in which to do the layout + * @param name the component name + * @see java.awt.CardLayout#addLayoutComponent(java.awt.Component, java.lang.Object) + */ + public void show(Container parent, Object constraint) { + synchronized (parent.getTreeLock()) { + checkLayout(parent); + Component next = null; + int ncomponents = vector.size(); + for (int i = 0; i < ncomponents; i++) { + Card card = (Card)vector.get(i); + if (card.constraint.equals(constraint)) { + next = card.comp; + currentCard = i; + break; + } + } + if ((next != null) && !next.isVisible()) { + ncomponents = parent.getComponentCount(); + for (int i = 0; i < ncomponents; i++) { + Component comp = parent.getComponent(i); + if (comp.isVisible()) { + comp.setVisible(false); + break; + } + } + next.setVisible(true); + parent.validate(); + } + } + } + + public Component getShowedComponent(Container parent){ + return parent.getComponent(currentCard); + } + + /** + * Make sure that the Container really has a CardLayout installed. + * Otherwise havoc can ensue! + */ + void checkLayout(Container parent) { + if (parent.getLayout() != this) { + throw new IllegalArgumentException("wrong parent for CardLayout"); + } + } + +} Added: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java =================================================================== --- trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java (rev 0) +++ trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java 2009-10-01 10:03:15 UTC (rev 1541) @@ -0,0 +1,40 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package jaxx.runtime.swing.navigation; + +import java.awt.Component; +import javax.swing.JPanel; +import jaxx.runtime.swing.CardLayout3; +import jaxx.runtime.swing.Item; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * + * @author letellier + */ +public class ItemNavigationCardPanel extends JPanel{ + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private final Log log = LogFactory.getLog(ItemNavigationCardPanel.class); + + CardLayout3 layout; + public ItemNavigationCardPanel(){ + super(); + layout = new CardLayout3(); + setLayout(layout); + } + + public void showItem(Item i){ + if (i != null && i.getValue() != null){ + layout.show(this, i.getValue().getClass()); + } + } + + public Component getShowedComponent(){ + return layout.getShowedComponent(this); + } +} Added: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/ItemTreeNavigationAdapter.java =================================================================== --- trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/ItemTreeNavigationAdapter.java (rev 0) +++ trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/ItemTreeNavigationAdapter.java 2009-10-01 10:03:15 UTC (rev 1541) @@ -0,0 +1,64 @@ +package jaxx.runtime.swing.navigation; + +import javax.swing.event.TreeSelectionEvent; +import javax.swing.event.TreeSelectionListener; +import javax.swing.tree.TreeModel; +import javax.swing.tree.TreePath; +import jaxx.runtime.JAXXObject; +import jaxx.runtime.swing.Item; +import jaxx.runtime.swing.JAXXTree; +import jaxx.runtime.swing.JAXXTree.JAXXTreeModel; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** A {@link javax.swing.event.TreeSelectionListener} implementation@@author letellier */ +public abstract class ItemTreeNavigationAdapter implements TreeSelectionListener { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private final Log log = LogFactory.getLog(ItemTreeNavigationAdapter.class); + + /** l'ui contenant l'arbre de navigation */ + protected JAXXObject context; + + protected JAXXTree tree; + protected ItemNavigationCardPanel cardPanel; + + public ItemTreeNavigationAdapter(JAXXObject context, JAXXTree tree, ItemNavigationCardPanel cardPanel) { + super(); + this.context = context; + this.tree = tree; + this.cardPanel = cardPanel; + + // Attache ce listener a l'arbre de navigation + tree.addTreeSelectionListener(this); + } + + @Override + public void valueChanged(TreeSelectionEvent e) { + log.debug("Selection in JAXXTree changed" + e.getPath()); + + // Recuperation du path selectionne + TreePath path = e.getNewLeadSelectionPath(); + TreeModel model = tree.getModel(); + + if (!(model instanceof JAXXTreeModel)){ + log.error("Its not an JAXXTreeModel"); + return; + } + // Find item coresponding + Item itemSelected = ((JAXXTreeModel) model).findItem(path.getLastPathComponent()); + + // Show corresponding panel + cardPanel.showItem(itemSelected); + + // Notifie change + valueChanged(itemSelected.getValue()); + } + + /** + * Method abstraite pour pouvoir propager la donnee selectionner + * + * @param data value of the node selected + */ + protected abstract void valueChanged(Object data); +}

1 0