portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pau...@apache.org
Subject cvs commit: jakarta-jetspeed/xdocs changes.xml
Date Mon, 05 Aug 2002 11:41:04 GMT
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 @@
   -->
         </ul>
                                                   <li>
  -  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
  +</li>
  +                                                <li>
  +  Add - 2002/08/03 - Added ability to move and delete Reference portlets in the MultiColumnController
   </li>
                                                   <li>
     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) <input type="hidden" name="$jslink.ActionKey" value="$action" > #end
     <center>
  -    <input type="submit" name="eventSubmit_doSave" value="$l10n.CUSTOMIZER_SAVEAPPLY"
>
  +    <table cellspacing="2">
  +      <tr>
  +        <td>
  +          <input type="submit" name="eventSubmit_doSave" value="$l10n.CUSTOMIZER_SAVEAPPLY"
>
  +        </td>
  +        <td>
  +          <input type="submit" name="eventSubmit_doCancel" value="$l10n.CUSTOMIZER_CANCEL">
  +        </td>
  +      </tr>
  +    </table>
     </center>
   </form>
  
  
  
  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 @@
   -->
         </ul>
   <li>
  -  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
  +</li>
  +<li>
  +  Add - 2002/08/03 - Added ability to move and delete Reference portlets in the MultiColumnController
   </li>
   <li>
     Fix - 2002/07/30 - Bug #6426 - Entries in deleted columns are now placed at 
  
  
  

--
To unsubscribe, e-mail:   <mailto:jetspeed-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:jetspeed-dev-help@jakarta.apache.org>


Mime
View raw message