portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r663357 - in /portals/jetspeed-2/portal: branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/layout/impl/ trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/
Date Wed, 04 Jun 2008 19:47:08 GMT
Author: taylor
Date: Wed Jun  4 12:47:07 2008
New Revision: 663357

URL: http://svn.apache.org/viewvc?rev=663357&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-862

Modified:
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java?rev=663357&r1=663356&r2=663357&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java
(original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java
Wed Jun  4 12:47:07 2008
@@ -16,21 +16,18 @@
  */
 package org.apache.jetspeed.layout.impl;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.ArrayList;
-import java.util.Set;
 import java.util.Map;
-import java.util.Collections;
-import java.util.Comparator;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.jetspeed.components.portletregistry.PortletRegistry;
 import org.apache.jetspeed.layout.Coordinate;
-import org.apache.jetspeed.layout.PortletPlacementException;
 import org.apache.jetspeed.layout.PortletPlacementContext;
+import org.apache.jetspeed.layout.PortletPlacementException;
 import org.apache.jetspeed.om.page.Fragment;
 import org.apache.jetspeed.om.page.Page;
 import org.apache.pluto.om.common.Parameter;
@@ -746,7 +743,7 @@
 		
 		if ( fragment != null )
 		{
-			if ( foundFragment == null || foundFragment.getId() != fragment.getId() )
+			if ( foundFragment == null || !foundFragment.getId().equals(fragment.getId()) )
 			{
 				sourceDesc = ( sourceDesc == null ? "getFragmentAtExpectedCoordinate" : sourceDesc );
 				
@@ -775,7 +772,11 @@
 					if ( rowIndex < 0 || rowIndex >= colFragCount )
 						out.append( "row is out of bounds, " );
 					out.append( "row-count=" ).append( colFragCount );
-				}
+				}			
+				if(foundFragment != null)
+				{
+					out.append(" - found fragment ").append(foundFragment.getId());
+				}				
 				out.append( ")" );
 				throw new PortletPlacementException( out.toString() );
 			}

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java?rev=663357&r1=663356&r2=663357&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java
Wed Jun  4 12:47:07 2008
@@ -743,7 +743,7 @@
 		
 		if ( fragment != null )
 		{
-			if ( foundFragment == null || foundFragment.getId() != fragment.getId() )
+            if ( foundFragment == null || !foundFragment.getId().equals(fragment.getId())
)               
 			{
 				sourceDesc = ( sourceDesc == null ? "getFragmentAtExpectedCoordinate" : sourceDesc );
 				
@@ -773,6 +773,10 @@
 						out.append( "row is out of bounds, " );
 					out.append( "row-count=" ).append( colFragCount );
 				}
+                if(foundFragment != null)
+                {
+                    out.append(" - found fragment ").append(foundFragment.getId());
+                }                
 				out.append( ")" );
 				throw new PortletPlacementException( out.toString() );
 			}



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message