morciuch 2003/01/14 11:54:41
Modified: docs/site changes.html
src/java/org/apache/jetspeed/services/profiler
JetspeedProfilerService.java
xdocs changes.xml
Log:
Fix to role merge feature failing to properly sequence the resulting panes if any of
the panes conain layout attribute with negative position (see Bugzilla bug# 15972).
Revision Changes Path
1.94 +3 -0 jakarta-jetspeed/docs/site/changes.html
Index: changes.html
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- changes.html 13 Jan 2003 17:24:35 -0000 1.93
+++ changes.html 14 Jan 2003 19:54:41 -0000 1.94
@@ -133,6 +133,9 @@
</li>
-->
<li>
+ Fixed - Bug # 15972 - 2003/01/13 - Role merge feature fails to properly sequence
the resulting panes (MO)
+</li>
+<li>
Update - Bug # 16033 - 2003/01/13 - Access to Add Reference button in the
Customizer is security driven defaulting to admin-only (MO)
</li>
<li>
1.44 +14 -9
jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java
Index: JetspeedProfilerService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- JetspeedProfilerService.java 12 Dec 2002 17:14:47 -0000 1.43
+++ JetspeedProfilerService.java 14 Jan 2003 19:54:41 -0000 1.44
@@ -116,6 +116,7 @@
import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.jetspeed.services.PsmlManager;
import org.apache.jetspeed.services.idgenerator.JetspeedIdGenerator;
+import org.apache.jetspeed.services.PortalToolkit;
// jetspeed.util
import org.apache.jetspeed.util.MimeType;
@@ -372,12 +373,13 @@
// Set the skin
Skin skin = new PsmlSkin();
-
skin.setName(org.apache.jetspeed.services.PortalToolkit.getSkin((String)
null).getName());
+ skin.setName(PortalToolkit.getSkin((String) null).getName());
portlets.setSkin(skin);
String mediaType = null;
// Process each role profile
+ int paneCount = 0;
for (Iterator it = profiles.iterator(); it.hasNext(); )
{
Profile roleProfile = (Profile)it.next();
@@ -386,22 +388,25 @@
Portlets tmpPortlets = tmpProfile.getDocument().getPortlets();
// If topmost control is a tab control, then add each tab to
the container
- Control tabControl = tmpPortlets.getControl();
- if (tabControl != null &&
tabControl.getName().equals(this.rolemergeControl))
+ Control paneControl = tmpPortlets.getControl();
+ if (paneControl != null &&
paneControl.getName().equals(this.rolemergeControl))
{
- int tabCount = tmpPortlets.getPortletsCount();
- for (int i = 0; i < tabCount; i++)
+ for (int i = 0; i < tmpPortlets.getPortletsCount(); i++)
{
- Portlets tab = tmpPortlets.getPortlets(i);
- portlets.addPortlets(tab);
+ Portlets pane = tmpPortlets.getPortlets(i);
+ pane.setLayout(null);
+ portlets.addPortlets(pane);
+ paneCount++;
}
}
- // Otherwise, add the contents of profile as a tab
+ // Otherwise, add the contents of profile as a pane
else
{
String title =
org.apache.turbine.util.StringUtils.firstLetterCaps(roleProfile.getRoleName());
tmpPortlets.setTitle(title + " Home");
+ tmpPortlets.setLayout(null);
portlets.addPortlets(tmpPortlets);
+ paneCount++;
}
if (Log.getLogger().isDebugEnabled())
1.111 +4 -1 jakarta-jetspeed/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- changes.xml 13 Jan 2003 17:24:35 -0000 1.110
+++ changes.xml 14 Jan 2003 19:54:41 -0000 1.111
@@ -23,6 +23,9 @@
</li>
-->
<li>
+ Fixed - Bug # 15972 - 2003/01/13 - Role merge feature fails to properly sequence
the resulting panes (MO)
+</li>
+<li>
Update - Bug # 16033 - 2003/01/13 - Access to Add Reference button in the
Customizer is security driven defaulting to admin-only (MO)
</li>
<li>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
