Author: chatellier Date: 2009-07-06 09:18:31 +0000 (Mon, 06 Jul 2009) New Revision: 2465 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeCellRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java Log: Another hack for tree truncated labels... Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeCellRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeCellRenderer.java 2009-07-02 18:11:02 UTC (rev 2464) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeCellRenderer.java 2009-07-06 09:18:31 UTC (rev 2465) @@ -20,7 +20,6 @@ import java.awt.Component; import java.awt.Dimension; -import java.awt.Rectangle; import javax.swing.JTree; @@ -36,10 +35,7 @@ * * Last update : $Date$ * By : $Author$ - * @deprecated since 3.2.0.5-rc1 : n'est plus utilise dans le code, il faut - * supprimer cette classe des que possible. */ - at Deprecated public class InputNavigationTreeCellRenderer extends NavigationTreeCellRenderer { /** @@ -50,34 +46,23 @@ public InputNavigationTreeCellRenderer(JAXXContext context) { super(context); } - - protected boolean inLoop; - + @Override public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) { - Component c = super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, - row, hasFocus); + Component c = super.getTreeCellRendererComponent(tree, value, sel, + expanded, leaf, row, hasFocus); - // ca c'est pas bien, mais ca fait une boucle infinie - if (!inLoop) { - inLoop = true; - // bugfix from http://forums.sun.com/thread.jspa?forumID=256&threadID=277338 - setPreferredSize(new Dimension((int) tree.getPreferredSize().getWidth(), (int) delegate.getPreferredSize().getHeight())); - inLoop = false; + // bugfix from http://forums.sun.com/thread.jspa?forumID=256&threadID=277338 + // hack from : http://forums.sun.com/thread.jspa?threadID=542069&tstart=824 + + if (delegate.getPreferredSize().getWidth() < 300) { + delegate.setPreferredSize(new Dimension(300, (int) delegate + .getPreferredSize().getHeight())); } - - + return c; } - - public void setPreferredSize(Dimension preferredSize){ - if (preferredSize.getWidth() == 0) { - delegate.setPreferredSize(null); - } else { - delegate.setPreferredSize(preferredSize); - } - } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-07-02 18:11:02 UTC (rev 2464) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-07-06 09:18:31 UTC (rev 2465) @@ -22,7 +22,7 @@ <javax.swing.tree.DefaultTreeSelectionModel id='navigationSelectionModel' selectionMode='{javax.swing.tree.TreeSelectionModel.SINGLE_TREE_SELECTION}'/> - <jaxx.runtime.swing.navigation.NavigationTreeCellRenderer id='navigationTreeCellRenderer' constructorParams='this'/> + <InputNavigationTreeCellRenderer id='navigationTreeCellRenderer' constructorParams='this'/> <jaxx.runtime.swing.CardLayout2 id='cardlayout'/> @@ -108,7 +108,9 @@ setContextValue(model); navigation.setModel(model); setTreeSelection("$root"); - //TC-20090702 Fix bug #1772 + + /*TC-20090702 Fix bug #1772 + EC-20090706 no working solution found model.nodeChanged(model.getRoot()); java.util.Enumeration<?> e = model.getRoot().children(); while (e.hasMoreElements()) { @@ -125,7 +127,7 @@ NavigationTreeNode n2 = (NavigationTreeNode) e2.nextElement(); n2.getJAXXContextValue(InputUI.this); } - } + }*/ } } @@ -248,13 +250,15 @@ </Table> <JPanel id="treePanel" name="treePanel" layout='{new BorderLayout()}'> <JScrollPane constraints='BorderLayout.CENTER'> - <JTree id="navigation" selectionModel='{getNavigationSelectionModel()}' cellRenderer='{getNavigationTreeCellRenderer()}' rootVisible="true" selectionRow='0' model='{new DefaultTreeModel(null)}'/> + <JTree id="navigation" selectionModel='{getNavigationSelectionModel()}' cellRenderer='{getNavigationTreeCellRenderer()}' + rootVisible="true" selectionRow='0' model='{new DefaultTreeModel(null)}' + rowHeight="0" /> </JScrollPane> </JPanel> </JPanel> <JPanel id='inputPanePrincipal' layout='{getCardlayoutPrincipal()}' minimumSize="{new java.awt.Dimension(0,0)}"> <NoneUI id='noneUI' constraints='"none"'/> - <JPanel id="inputPane" layout='{getCardlayout()}' constraints='"normale"'/> + <JPanel id="inputPane" layout='{getCardlayout()}' constraints='"normale"'/> </JPanel> </JSplitPane> </JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-07-02 18:11:02 UTC (rev 2464) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-07-06 09:18:31 UTC (rev 2465) @@ -21,7 +21,7 @@ <javax.swing.tree.DefaultTreeSelectionModel id='navigationSelectionModel' selectionMode='{javax.swing.tree.TreeSelectionModel.SINGLE_TREE_SELECTION}'/> - <jaxx.runtime.swing.navigation.NavigationTreeCellRenderer id='navigationTreeCellRenderer' constructorParams='this'/> + <fr.ifremer.isisfish.ui.input.InputNavigationTreeCellRenderer id='navigationTreeCellRenderer' constructorParams='this'/> <jaxx.runtime.swing.CardLayout2 id='cardlayout'/> @@ -113,7 +113,9 @@ setContextValue(model); navigation.setModel(model); setTreeSelection("$root"); - //TC-20090702 Fix bug #1772 + + /*TC-20090702 Fix bug #1772 + EC-20090706 no working solution found model.nodeChanged(model.getRoot()); java.util.Enumeration<?> e = model.getRoot().children(); while (e.hasMoreElements()) { @@ -130,7 +132,7 @@ NavigationTreeNode n2 = (NavigationTreeNode) e2.nextElement(); n2.getJAXXContextValue(SensitivityTabUI.this); } - } + }*/ } } public void repaintNode(String path) { Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2009-07-02 18:11:02 UTC (rev 2464) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2009-07-06 09:18:31 UTC (rev 2465) @@ -28,8 +28,6 @@ import javax.swing.JOptionPane; import javax.swing.JTree; import javax.swing.SwingUtilities; -import javax.swing.tree.DefaultMutableTreeNode; -import javax.swing.tree.TreeNode; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;