From do-not-reply at jboss.org Thu May 13 03:19:56 2010
Content-Type: multipart/mixed; boundary="===============3682697087819713759=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: gatein-commits at lists.jboss.org
Subject: [gatein-commits] gatein SVN: r3074 -
 portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation.
Date: Thu, 13 May 2010 03:19:56 -0400
Message-ID: <201005130719.o4D7JuUA023200@svn01.web.mwc.hst.phx2.redhat.com>

--===============3682697087819713759==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: hoang_to
Date: 2010-05-13 03:19:55 -0400 (Thu, 13 May 2010)
New Revision: 3074

Modified:
   portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/nav=
igation/PageNavigationUtils.java
   portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/nav=
igation/UINavigationNodeSelector.java
Log:
Convert the nested class ParentChildPair into top level class, refactor rel=
evant code

Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/we=
bui/navigation/PageNavigationUtils.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/na=
vigation/PageNavigationUtils.java	2010-05-13 07:06:06 UTC (rev 3073)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/na=
vigation/PageNavigationUtils.java	2010-05-13 07:19:55 UTC (rev 3074)
@@ -406,8 +406,8 @@
       {
          int firstNavPriority =3D firstNav.getPriority();
          int secondNavPriority =3D secondNav.getPriority();
-         =

-         if(firstNavPriority =3D=3D secondNavPriority)
+
+         if (firstNavPriority =3D=3D secondNavPriority)
          {
             String firstNavId =3D firstNav.getOwnerId();
             String secondNavId =3D secondNav.getOwnerId();
@@ -415,7 +415,7 @@
          }
          else
          {
-            if(firstNavPriority < secondNavPriority)
+            if (firstNavPriority < secondNavPriority)
             {
                return -1;
             }
@@ -425,44 +425,5 @@
             }
          }
       }
-   }
-   =

-   /**
-    * =

-    * @author <a href=3D"mailto:hoang281283(a)gmail.com">Minh Hoang TO</a>
-    * @version $Id$
-    *
-    */
-   public static class ParentChildPair
-   {
-      private PageNode parentNode;
-      =

-      private PageNode childNode;
-      =

-      public ParentChildPair(PageNode _parentNode, PageNode _childNode)
-      {
-         this.parentNode =3D _parentNode;
-         this.childNode =3D _childNode;
-      }
-      =

-      public PageNode getParentNode()
-      {
-         return parentNode;
-      }
-      =

-      public PageNode getChildNode()
-      {
-         return childNode;
-      }
-      =

-      public void setParentNode(PageNode _parentNode)
-      {
-         this.parentNode =3D _parentNode;
-      }
-      =

-      public void setChildNode(PageNode _childNode)
-      {
-         this.childNode =3D _childNode;
-      }
-   }
+   }   =

 }

Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/we=
bui/navigation/UINavigationNodeSelector.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/na=
vigation/UINavigationNodeSelector.java	2010-05-13 07:06:06 UTC (rev 3073)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/na=
vigation/UINavigationNodeSelector.java	2010-05-13 07:19:55 UTC (rev 3074)
@@ -26,7 +26,7 @@
 import org.exoplatform.portal.config.model.PageNode;
 import org.exoplatform.portal.config.model.PortalConfig;
 import org.exoplatform.portal.mop.Visibility;
-import org.exoplatform.portal.webui.navigation.PageNavigationUtils.ParentC=
hildPair;
+import org.exoplatform.portal.webui.navigation.ParentChildPair;
 import org.exoplatform.portal.webui.page.UIPage;
 import org.exoplatform.portal.webui.page.UIPageNodeForm2;
 import org.exoplatform.portal.webui.portal.UIPortalComposer;


--===============3682697087819713759==--