Author: tchemit Date: 2009-01-07 08:32:54 +0000 (Wed, 07 Jan 2009) New Revision: 1124 Modified: jaxx/trunk/jaxx-runtime-swing/changelog.txt jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/CardLayout2.java jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeModelBuilder.java Log: am?\195?\169lioration CardLayout2 pour pouvoir ne tenir en compte que du composent visible pour le calcul des tailles et permettre aussi de vider le layout. Modified: jaxx/trunk/jaxx-runtime-swing/changelog.txt =================================================================== --- jaxx/trunk/jaxx-runtime-swing/changelog.txt 2009-01-05 10:16:45 UTC (rev 1123) +++ jaxx/trunk/jaxx-runtime-swing/changelog.txt 2009-01-07 08:32:54 UTC (rev 1124) @@ -1,4 +1,4 @@ -1.0 ???? 2009012?? +1.0 chemit 200900107 * 20090105 [chemit] - improve CardLayout2 0.8 ??? 200812?? * 20081228 [chemit] - generify ClassDescriptor Modified: jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/CardLayout2.java =================================================================== --- jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/CardLayout2.java 2009-01-05 10:16:45 UTC (rev 1123) +++ jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/CardLayout2.java 2009-01-07 08:32:54 UTC (rev 1124) @@ -177,7 +177,6 @@ */ @Override public void layoutContainer(Container parent) { - Dimension dimension = null; if (useOnlyVisibleComponentDimension) { Component comp = getVisibleComponent(parent); if (comp != null) { @@ -201,4 +200,22 @@ public void setUseOnlyVisibleComponentDimension(boolean useOnlyVisibleComponentDimension) { this.useOnlyVisibleComponentDimension = useOnlyVisibleComponentDimension; } + + /** + * remove from cardlayout and linked container all his components. + * + * @param parent the parent container linked with the layout + */ + public void reset(Container parent) { + if (parent.getLayout() != this) { + throw new IllegalArgumentException("wrong parent for CardLayout"); + } + for (Component component : parent.getComponents()) { + removeLayoutComponent(component); + parent.remove(component); + } + contexts.clear(); + + } + } Modified: jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeModelBuilder.java =================================================================== --- jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeModelBuilder.java 2009-01-05 10:16:45 UTC (rev 1123) +++ jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeModelBuilder.java 2009-01-07 08:32:54 UTC (rev 1124) @@ -88,9 +88,6 @@ public NavigationTreeNode removeChildNode(NavigationTreeNode node) { NavigationTreeNode parentNode = node.getParent(); - /*if (parentNode != null) { - parentNode.remove(node); - }*/ model.removeNodeFromParent(node); return parentNode; }