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/src/java/org/apache/jetspeed/modules/actions/controllers MultiColumnControllerAction.java
Date Thu, 08 Aug 2002 02:57:11 GMT
paulsp      2002/08/07 19:57:11

  Modified:    src/java/org/apache/jetspeed/modules/actions/controllers
                        MultiColumnControllerAction.java
  Log:
  Split exitCustomizer() out of doCancel()
  
  Revision  Changes    Path
  1.18      +11 -5     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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- MultiColumnControllerAction.java	5 Aug 2002 11:41:04 -0000	1.17
  +++ MultiColumnControllerAction.java	8 Aug 2002 02:57:11 -0000	1.18
  @@ -364,14 +364,20 @@
        */
       public void doCancel(RunData data, Context context)
       {
  -        JetspeedLink jsLink = null;
  -        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();
  +        
  +        exitCustomizer( data, context);
  +    }
  +
  +    private void exitCustomizer(RunData data, Context context)
  +    {
  +        JetspeedLink jsLink = null;
  +        data.getUser().removeTemp("columns");
  +        ((JetspeedRunData) data).setCustomized(null);
  +
   
           if (((JetspeedRunData) data).getCustomized() == null)
           {
  @@ -427,7 +433,7 @@
               Log.error("Error while saving profile", e);
           }
   
  -        doCancel(data, context);
  +        exitCustomizer( data, context);
       }
   
       public void doDelete(RunData data, Context context)
  
  
  

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