From jetspeed-dev-return-4934-qmlist-jakarta-archive-jetspeed-dev=jakarta.apache.org@jakarta.apache.org Mon Aug 05 11:41:24 2002 Return-Path: Delivered-To: apmail-jakarta-jetspeed-dev-archive@apache.org Received: (qmail 32270 invoked from network); 5 Aug 2002 11:41:10 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 5 Aug 2002 11:41:10 -0000 Received: (qmail 5158 invoked by uid 97); 5 Aug 2002 11:41:29 -0000 Delivered-To: qmlist-jakarta-archive-jetspeed-dev@jakarta.apache.org Received: (qmail 5106 invoked by uid 97); 5 Aug 2002 11:41:28 -0000 Mailing-List: contact jetspeed-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Jetspeed Developers List" Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@jakarta.apache.org Received: (qmail 5095 invoked by uid 97); 5 Aug 2002 11:41:27 -0000 X-Antivirus: nagoya (v4198 created Apr 24 2002) Date: 5 Aug 2002 11:41:04 -0000 Message-ID: <20020805114104.64771.qmail@icarus.apache.org> From: paulsp@apache.org To: jakarta-jetspeed-cvs@apache.org Subject: cvs commit: jakarta-jetspeed/xdocs changes.xml X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N paulsp 2002/08/05 04:41:04 Modified: docs/site changes.html src/java/org/apache/jetspeed/modules/actions/controllers MultiColumnControllerAction.java webapp/WEB-INF/templates/vm/controllers/html multicolumn-customize.vm xdocs changes.xml Log: o Add cancel button to the MultiColumnController Customizer. o MultiColumnController.doCancel() now reloads PSML Revision Changes Path 1.40 +4 -1 jakarta-jetspeed/docs/site/changes.html Index: changes.html =================================================================== RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- changes.html 3 Aug 2002 15:24:25 -0000 1.39 +++ changes.html 5 Aug 2002 11:41:04 -0000 1.40 @@ -130,7 +130,10 @@ -->
  • - Add - 2002/08/03 - Added ability to move and delete Reference portlets in the MultiController + Add - 2002/08/05 - Added cancel button to the MultiColumnController customizer +
    • +
  • + Add - 2002/08/03 - Added ability to move and delete Reference portlets in the MultiColumnController
  • Fix - 2002/07/30 - Bug #6426 - Entries in deleted columns are now placed at 1.17 +11 -6 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java Index: MultiColumnControllerAction.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- MultiColumnControllerAction.java 3 Aug 2002 16:10:41 -0000 1.16 +++ MultiColumnControllerAction.java 5 Aug 2002 11:41:04 -0000 1.17 @@ -93,7 +93,7 @@ import java.util.HashMap; import java.util.StringTokenizer; -/**9 +/** * This action builds a context suitable for controllers handling * grid positioned layout using PortletSet.Constraints * @@ -368,6 +368,11 @@ data.getUser().removeTemp("columns"); ((JetspeedRunData) data).setCustomized(null); + // Cause profile to be reloaded from the PSML. + Profile profile = ((JetspeedRunData) data).getProfile(); + profile.setDocument(null); + profile.getDocument(); + if (((JetspeedRunData) data).getCustomized() == null) { ((JetspeedRunData) data).setMode("default"); @@ -631,9 +636,9 @@ int rowNum = 0; while (iterator.hasNext()) { - Entry entry = (Entry) iterator.next(); + IdentityElement identityElement = (IdentityElement) iterator.next(); - Layout layout = entry.getLayout(); + Layout layout = identityElement.getLayout(); if (layout != null) { @@ -786,13 +791,13 @@ * @param sizeList java.lang.String a comma separated string a values * @return a List of values */ - protected static List getCellSizes(String sizelist) + protected static List getCellSizes(String sizeList) { List list = new Vector(); - if (sizelist != null) + if (sizeList != null) { - StringTokenizer st = new StringTokenizer(sizelist, ","); + StringTokenizer st = new StringTokenizer(sizeList, ","); while (st.hasMoreTokens()) { list.add(st.nextToken()); 1.13 +10 -1 jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/multicolumn-customize.vm Index: multicolumn-customize.vm =================================================================== RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/multicolumn-customize.vm,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- multicolumn-customize.vm 3 Aug 2002 15:24:25 -0000 1.12 +++ multicolumn-customize.vm 5 Aug 2002 11:41:04 -0000 1.13 @@ -136,6 +136,15 @@ #end #if ($action) #end
    - + + + + + +
    + + + +
    1.58 +5 -2 jakarta-jetspeed/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- changes.xml 3 Aug 2002 15:24:25 -0000 1.57 +++ changes.xml 5 Aug 2002 11:41:04 -0000 1.58 @@ -24,7 +24,10 @@ -->
  • - Add - 2002/08/03 - Added ability to move and delete Reference portlets in the MultiController + Add - 2002/08/05 - Added cancel button to the MultiColumnController customizer +
    • +
  • + Add - 2002/08/03 - Added ability to move and delete Reference portlets in the MultiColumnController
  • Fix - 2002/07/30 - Bug #6426 - Entries in deleted columns are now placed at -- To unsubscribe, e-mail: For additional commands, e-mail: