portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets CustomizeAction.java
Date Thu, 27 May 2004 06:02:04 GMT
taylor      2004/05/26 23:02:04

  Modified:    src/java/org/apache/jetspeed/modules/actions/controllers
                        MultiColumnControllerAction.java
                        RowColumnControllerAction.java
               src/java/org/apache/jetspeed/modules/actions/portlets
                        CustomizeAction.java
  Log:
  make endCustomize action configurable to hook into Save and Cancel events on customization
  
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  1.31      +6 -3      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.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- MultiColumnControllerAction.java	23 Feb 2004 02:49:58 -0000	1.30
  +++ MultiColumnControllerAction.java	27 May 2004 06:02:03 -0000	1.31
  @@ -33,6 +33,7 @@
   import org.apache.jetspeed.portal.PortletController;
   import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
   import org.apache.jetspeed.services.logging.JetspeedLogger;
  +import org.apache.jetspeed.services.resources.JetspeedResources;
   import org.apache.jetspeed.services.rundata.JetspeedRunData;
   import org.apache.jetspeed.services.Registry;
   import org.apache.jetspeed.services.statemanager.SessionState;
  @@ -357,7 +358,8 @@
           {
               try
               {
  -                ActionLoader.getInstance().exec(data, "controls.EndCustomize");
  +                String actionName = JetspeedResources.getString(JetspeedResources.CUSTOMIZATION_CANCEL_ACTION,
"controls.EndCustomize");
  +                ActionLoader.getInstance().exec(data, actionName);                
               }
               catch (Exception e)
               {
  @@ -407,7 +409,8 @@
   
               try
               {
  -                ActionLoader.getInstance().exec(data, "controls.EndCustomize");
  +                String actionName = JetspeedResources.getString(JetspeedResources.CUSTOMIZATION_SAVE_ACTION,
"controls.EndCustomize");
  +                ActionLoader.getInstance().exec(data, actionName);                
               }
               catch (Exception e)
               {
  
  
  
  1.22      +5 -2      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/RowColumnControllerAction.java
  
  Index: RowColumnControllerAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/RowColumnControllerAction.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- RowColumnControllerAction.java	23 Feb 2004 02:49:58 -0000	1.21
  +++ RowColumnControllerAction.java	27 May 2004 06:02:04 -0000	1.22
  @@ -28,6 +28,7 @@
   import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
   import org.apache.jetspeed.services.logging.JetspeedLogger;
   import org.apache.jetspeed.services.Registry;
  +import org.apache.jetspeed.services.resources.JetspeedResources;
   import org.apache.jetspeed.services.rundata.JetspeedRunData;
   import org.apache.jetspeed.util.AutoProfile;
   
  @@ -278,7 +279,8 @@
           {
               try
               {
  -                ActionLoader.getInstance().exec( data, "controls.EndCustomize" );
  +                String actionName = JetspeedResources.getString(JetspeedResources.CUSTOMIZATION_CANCEL_ACTION,
"controls.EndCustomize");
  +                ActionLoader.getInstance().exec(data, actionName);                
               }
               catch (Exception e)
               {
  @@ -312,7 +314,8 @@
   
               try
               {
  -                ActionLoader.getInstance().exec( data, "controls.EndCustomize" );
  +                String actionName = JetspeedResources.getString(JetspeedResources.CUSTOMIZATION_SAVE_ACTION,
"controls.EndCustomize");
  +                ActionLoader.getInstance().exec(data, actionName);
               }
               catch (Exception e)
               {
  
  
  
  1.30      +3 -1      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeAction.java
  
  Index: CustomizeAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeAction.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- CustomizeAction.java	23 Feb 2004 02:56:58 -0000	1.29
  +++ CustomizeAction.java	27 May 2004 06:02:04 -0000	1.30
  @@ -25,6 +25,7 @@
   import org.apache.jetspeed.portal.portlets.VelocityPortlet;
   import org.apache.jetspeed.services.persistence.PersistenceManager;
   import org.apache.jetspeed.services.Registry;
  +import org.apache.jetspeed.services.resources.JetspeedResources;
   import org.apache.jetspeed.services.rundata.JetspeedRunData;
   import org.apache.jetspeed.om.BaseSecurityReference;
   import org.apache.jetspeed.om.profile.Entry;
  @@ -184,7 +185,8 @@
           {
               try
               {
  -                ActionLoader.getInstance().exec( rundata, "controls.EndCustomize" );
  +                String actionName = JetspeedResources.getString(JetspeedResources.CUSTOMIZATION_CANCEL_ACTION,
"controls.EndCustomize");
  +                ActionLoader.getInstance().exec(rundata, actionName);                
               }
               catch (Exception e)
               {
  
  
  

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


Mime
View raw message