r1755 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation - Jaxx-commits

6 Mar 2010

Author: tchemit
Date: 2010-03-06 14:39:52 +0100 (Sat, 06 Mar 2010)
New Revision: 1755

Log:
reformat code

Modified:
   trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeContextHelper.java
   trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHelper.java

Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeContextHelper.java
===================================================================

--- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeContextHelper.java	2010-03-06 13:39:11 UTC (rev 1754)
+++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeContextHelper.java	2010-03-06 13:39:52 UTC (rev 1755)
@@ -20,8 +20,6 @@
  */
 package jaxx.runtime.swing.navigation;
 
-import javax.swing.JTree;
-
 import jaxx.runtime.JAXXContext;
 import jaxx.runtime.JAXXUtil;
 import jaxx.runtime.context.JAXXContextEntryDef;
@@ -113,20 +111,22 @@
     }
 
     /**
-     * @deprecated please use {@link #getModel(JAXXContext)}, will be remove soon
-     * @param context
+     * @param context where to find model
+     * @deprecated please use {@link #getModel(JAXXContext)}, will be remove
+     *             soon
      */
     @Deprecated
     public NavigationTreeModel getTreeModel(JAXXContext context) {
         NavigationModel r = getModel(context);
-        if (r instanceof NavigationTreeModel){
-            return (NavigationTreeModel)r;
+        if (r instanceof NavigationTreeModel) {
+            return (NavigationTreeModel) r;
         }
         return null;
     }
 
     public NavigationTreeHandler getTreeHandler(JAXXContext context) {
-        NavigationTreeHandler r = getTreeHandlerContextEntry().getContextValue(context);
+        NavigationTreeHandler r =
+                getTreeHandlerContextEntry().getContextValue(context);
         return r;
     }
 
@@ -178,9 +178,10 @@
 //    }
 
     /**
-     * @deprecated please use {@link #setModel(JAXXContext, NavigationModel)}, will be remove soon
-     * @param context
-     * @param model
+     * @param context where to store model
+     * @param model   model to store
+     * @deprecated please use {@link #setModel(JAXXContext, NavigationModel)},
+     *             will be remove soon
      */
     @Deprecated
     public void setTreeModel(JAXXContext context, NavigationModel model) {
@@ -199,7 +200,8 @@
         getTreeTableContextEntry().setContextValue(context, treeTable);
     }
 
-    public void setTreeHandler(JAXXContext context, NavigationTreeHandler handler) {
+    public void setTreeHandler(JAXXContext context,
+                               NavigationTreeHandler handler) {
         getTreeHandlerContextEntry().setContextValue(context, handler);
     }
 
@@ -269,7 +271,8 @@
         return modelContextEntry;
     }
 
-    protected JAXXContextEntryDef<NavigationTreeHandler> getTreeHandlerContextEntry() {
+    protected JAXXContextEntryDef<NavigationTreeHandler>
+    getTreeHandlerContextEntry() {
         return handlerContextEntry;
     }
 

Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHelper.java
===================================================================
--- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHelper.java	2010-03-06 13:39:11 UTC (rev 1754)
+++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHelper.java	2010-03-06 13:39:52 UTC (rev 1755)
@@ -24,7 +24,6 @@
 import java.util.Enumeration;
 import java.util.regex.Pattern;
 import javax.swing.JTree;
-import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreePath;
 import jaxx.runtime.JAXXContext;
 import jaxx.runtime.JAXXObject;
@@ -46,7 +45,8 @@
     /**
      * Logger
      */
-    static private final Log log = LogFactory.getLog(NavigationTreeHelper.class);
+    static private final Log log =
+            LogFactory.getLog(NavigationTreeHelper.class);
 
     /**
      * Create the model.
@@ -68,7 +68,9 @@
         super(contextPrefix);
     }
 
-    public Object getContextValue(JAXXContext context, String path) throws InvocationTargetException, NoSuchMethodException, IllegalAccessException {
+    public Object getContextValue(JAXXContext context, String path)
+            throws InvocationTargetException, NoSuchMethodException,
+            IllegalAccessException {
         NavigationModel treeModel = getSafeModel(context);
         return treeModel.getBean(path);
     }
@@ -78,18 +80,21 @@
         return treeModel.findNode(path);
     }
 
-    public NavigationTreeNode findNode(JAXXContext context, String path, String regex) {
+    public NavigationTreeNode findNode(JAXXContext context, String path,
+                                       String regex) {
         NavigationModel treeModel = getSafeModel(context);
         return treeModel.findNode(path, regex);
     }
 
-    public NavigationTreeNode findNode(JAXXContext context, String path, Pattern regex) {
+    public NavigationTreeNode findNode(JAXXContext context, String path,
+                                       Pattern regex) {
 
         NavigationModel treeModel = getSafeModel(context);
         return treeModel.findNode(path, regex);
     }
 
-    public NavigationTreeNode findNode(JAXXContext context, String path, String regex, String suffix) {
+    public NavigationTreeNode findNode(JAXXContext context, String path,
+                                       String regex, String suffix) {
 
         NavigationModel treeModel = getSafeModel(context);
 
@@ -100,7 +105,8 @@
         return navigationTreeNode;
     }
 
-    public NavigationTreeNode findNode(JAXXContext context, String path, Pattern regex, String suffix) {
+    public NavigationTreeNode findNode(JAXXContext context, String path,
+                                       Pattern regex, String suffix) {
 
         NavigationModel treeModel = getSafeModel(context);
 
@@ -177,9 +183,11 @@
      *
      * @param current   the node to test
      * @param beanClass the type of the internal class to seek of
-     * @return the first ancestor node with the matching class or {@code null} if not found
+     * @return the first ancestor node with the matching class or
+     *         {@code null} if not found
      */
-    public NavigationTreeNode getParentNode(NavigationTreeNode current, Class<?> beanClass) {
+    public NavigationTreeNode getParentNode(NavigationTreeNode current,
+                                            Class<?> beanClass) {
         if (current == null) {
             // ancestor not found
             return null;
@@ -233,7 +241,8 @@
      * @param node le noeud à repaindre
      * @param deep un flag pour activer la repainte de la descendance du noeud
      */
-    public void repaintNode(JAXXContext context, NavigationTreeNode node, boolean deep) {
+    public void repaintNode(JAXXContext context, NavigationTreeNode node,
+                            boolean deep) {
         NavigationModel navigationModel = getSafeModel(context);
         if (log.isDebugEnabled()) {
             log.debug(node);
@@ -251,11 +260,15 @@
     }
 
     /**
-     * @deprecated please use {@link #getSafeModel(JAXXContext)}, will be remove soon
-     * @param context
+     * @deprecated please use {@link #getSafeModel(JAXXContext)}, will be
+     *             remove soon
+     * @param context where to find
+     * @return the tree model
+     * @throws NullPointerException if model is null
      */
     @Deprecated
-    public NavigationTreeModel getSafeTreeModel(JAXXContext context) throws NullPointerException {
+    public NavigationTreeModel getSafeTreeModel(JAXXContext context)
+            throws NullPointerException {
         NavigationModel model = getSafeModel(context);
         if (model instanceof NavigationTreeModel){
             return (NavigationTreeModel) model;
@@ -263,10 +276,13 @@
         return null;
     }
 
-    public NavigationModel getSafeModel(JAXXContext context) throws NullPointerException {
+    public NavigationModel getSafeModel(JAXXContext context)
+            throws NullPointerException {
         NavigationModel model = getModel(context);
         if (model == null) {
-            throw new NullPointerException("could not find tree model with key " + getModelContextEntry() + " in context " + context);
+            throw new NullPointerException("could not find tree model " +
+                    "with key " + getModelContextEntry() + " in context " +
+                    context);
         }
         return model;
     }
@@ -274,15 +290,18 @@
     public JTree getSafeTree(JAXXContext context) throws NullPointerException {
         JTree tree = getTree(context);
         if (tree == null) {
-            throw new NullPointerException("could not find tree with key " + getTreeContextEntry() + " in context " + context);
+            throw new NullPointerException("could not find tree with key " +
+                    getTreeContextEntry() + " in context " + context);
         }
         return tree;
     }
 
-    public JXTreeTable getSafeTreeTable(JAXXContext context) throws NullPointerException {
+    public JXTreeTable getSafeTreeTable(JAXXContext context)
+            throws NullPointerException {
         JXTreeTable treeTable = getTreeTable(context);
         if (treeTable == null) {
-            throw new NullPointerException("could not find tree with key " + getTreeTableContextEntry() + " in context " + context);
+            throw new NullPointerException("could not find tree with key " +
+                    getTreeTableContextEntry() + " in context " + context);
         }
         return treeTable;
     }

    

r1755 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation

tchemit＠users.nuiton.org

tags

participants (1)