Author: tchemit Date: 2010-03-15 23:30:47 +0100 (Mon, 15 Mar 2010) New Revision: 1790 Log: clean code Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationMultiTreeHandler.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationOneClicSelectionHandler.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationMultiTreeHandler.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationMultiTreeHandler.java 2010-03-15 20:20:02 UTC (rev 1789) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationMultiTreeHandler.java 2010-03-15 22:30:47 UTC (rev 1790) @@ -25,15 +25,11 @@ import jaxx.runtime.JAXXObject; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.JXTreeTable; import javax.swing.event.TreeSelectionEvent; import javax.swing.tree.TreePath; -import javax.swing.tree.TreeSelectionModel; import java.awt.Component; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.List; /** @@ -52,14 +48,17 @@ /** * Logger */ - static private final Log log = LogFactory.getLog(NavigationMultiTreeHandler.class); + static private final Log log = + LogFactory.getLog(NavigationMultiTreeHandler.class); - public NavigationMultiTreeHandler(String contextPrefix, JAXXObject context, Strategy strategy) { + public NavigationMultiTreeHandler(String contextPrefix, + JAXXObject context, + Strategy strategy) { super(contextPrefix, context, strategy); // Enable multi selection - super.setSelectionMode(TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION); + setSelectionMode(DISCONTIGUOUS_TREE_SELECTION); } @Override @@ -73,7 +72,8 @@ return; } for(TreePath path : paths){ - NavigationTreeNode node = (NavigationTreeNode) path.getLastPathComponent(); + NavigationTreeNode node = + (NavigationTreeNode) path.getLastPathComponent(); nodes.add(node); if (log.isDebugEnabled()){ log.debug("Adding path : " + path); @@ -90,7 +90,9 @@ * @param nodes les node de l'ui a ouvrir * @throws Exception if any */ - protected abstract void openUI(Component newUI, List<NavigationTreeNode> nodes) throws Exception; + protected abstract void openUI(Component newUI, + List<NavigationTreeNode> nodes) + throws Exception; /** * Instancie une nouvelle ui associé à des noeuds de l'arbre de navigation @@ -99,7 +101,8 @@ * @return la nouvelle ui associée au noeud * @throws Exception if any */ - protected abstract Component createUI(List<NavigationTreeNode> nodes) throws Exception; + protected abstract Component createUI(List<NavigationTreeNode> nodes) + throws Exception; /** * @param nodes les noeuds associés à l'ui à retrouver @@ -121,7 +124,8 @@ if (log.isTraceEnabled()) { log.trace(path); } - // now, we are free to open the ui associated with the selected node in navigation + // now, we are free to open the ui associated with the selected + // node in navigation // get the bean associated with the node beans.add(getNavigationTreeModel().getBean(path)); @@ -134,12 +138,13 @@ NavigationTreeContextHelper helper = getContextHelper(); // remove previous selected bean - //TODO-TC-20091004 should have an automatic clean context method while + //TODO-TC-20091004 should have an automatic clean context method + //TODO-TC-20091004 while helper.setSelectedBean(ctxt, null); - if (beans != null) { - helper.setSelectedBeans(ctxt, beans); - } +// if (beans != null) { + helper.setSelectedBeans(ctxt, beans); +// } if (newUI == null) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationOneClicSelectionHandler.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationOneClicSelectionHandler.java 2010-03-15 20:20:02 UTC (rev 1789) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationOneClicSelectionHandler.java 2010-03-15 22:30:47 UTC (rev 1790) @@ -52,10 +52,13 @@ /** * Logger */ - static private final Log log = LogFactory.getLog(NavigationOneClicSelectionHandler.class); + static private final Log log = + LogFactory.getLog(NavigationOneClicSelectionHandler.class); - public NavigationOneClicSelectionHandler(String contextPrefix, JAXXObject context, NavigationTreeHandler.Strategy strategy) { + public NavigationOneClicSelectionHandler(String contextPrefix, + JAXXObject context, + Strategy strategy) { super(contextPrefix, context, strategy); }