portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r219585 - in /portals/jetspeed-2/trunk/components/page-manager/src: java/org/apache/jetspeed/page/impl/AbstractPageManager.java test/org/apache/jetspeed/page/TestCastorXmlPageManager.java
Date Tue, 19 Jul 2005 00:27:39 GMT
Author: taylor
Date: Mon Jul 18 17:27:17 2005
New Revision: 219585

URL: http://svn.apache.org/viewcvs?rev=219585&view=rev
Log:
double bug combo causing decorators to not be set
bug 1 in clonePage method
bug 2 in typo in unit test

Modified:
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/AbstractPageManager.java
    portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/AbstractPageManager.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/AbstractPageManager.java?rev=219585&r1=219584&r2=219585&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/AbstractPageManager.java
(original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/AbstractPageManager.java
Mon Jul 18 17:27:17 2005
@@ -569,8 +569,8 @@
         Page page = newPage(path);
         page.setTitle(source.getTitle());
         page.setShortTitle(source.getShortTitle());
-        page.setDefaultDecorator(source.getDefaultDecorator(Fragment.LAYOUT), Fragment.LAYOUT);
-        page.setDefaultDecorator(source.getDefaultDecorator(Fragment.PORTLET), Fragment.PORTLET);
+        page.setDefaultDecorator(Fragment.LAYOUT, source.getDefaultDecorator(Fragment.LAYOUT));
+        page.setDefaultDecorator(Fragment.PORTLET, source.getDefaultDecorator(Fragment.PORTLET));
         page.setDefaultSkin(source.getDefaultSkin());
             
         // TODO: clone the metadata

Modified: portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java?rev=219585&r1=219584&r2=219585&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java
(original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java
Mon Jul 18 17:27:17 2005
@@ -860,10 +860,10 @@
         
         assertTrue(clone.getId().equals("/cloned.psml"));
         assertTrue(clone.getName().equals("cloned.psml"));
-        assertTrue(testpage.getTitle().equals("Test Page"));
-        assertTrue(testpage.getDefaultSkin().equals("test-skin"));
-        assertTrue(testpage.getDefaultDecorator(Fragment.LAYOUT).equals("test-layout"));
-        assertTrue(testpage.getDefaultDecorator(Fragment.PORTLET).equals("test-portlet"));
+        assertTrue(clone.getTitle().equals("Test Page"));
+        assertTrue(clone.getDefaultSkin().equals("test-skin"));
+        assertTrue(clone.getDefaultDecorator(Fragment.LAYOUT).equals("test-layout"));
+        assertTrue(clone.getDefaultDecorator(Fragment.PORTLET).equals("test-portlet"));
 
         // TODO: Test Meta data
         Fragment root = testpage.getRootFragment();



---------------------------------------------------------------------
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