continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r499782 - /maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/
Date Thu, 25 Jan 2007 13:32:17 GMT
Author: evenisse
Date: Thu Jan 25 05:32:08 2007
New Revision: 499782

URL: http://svn.apache.org/viewvc?view=rev&rev=499782
Log:
Fix javadoc and format

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractGroupNotifierEditAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractNotifierEditActionSupport.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractProjectNotifierEditAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddGroupNotifierAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteGroupNotifierAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteProjectNotifierAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonProjectNotifierEditAction.java

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractGroupNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractGroupNotifierEditAction.java?view=diff&rev=499782&r1=499781&r2=499782
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractGroupNotifierEditAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractGroupNotifierEditAction.java
Thu Jan 25 05:32:08 2007
@@ -25,7 +25,7 @@
 
 /**
  * Common base class for all Project Group notifier edit actions.
- * 
+ *
  * @author <a href='mailto:rahul.thakur.xdev@gmail.com'>Rahul Thakur</a>
  * @version $Id$
  */
@@ -38,12 +38,12 @@
      */
     private int projectGroupId;
 
-    /** 
-     * Creates or updates the {@link ProjectNotifier} instance for the 
+    /**
+     * Creates or updates the {@link ProjectNotifier} instance for the
      * {@link ProjectGroup} here.<p>
-     * This is used by the subclasses that create/obtain an instance of 
+     * This is used by the subclasses that create/obtain an instance of
      * {@link ProjectNotifier} to be saved.
-     * 
+     *
      * @see org.apache.maven.continuum.web.action.notifier.AbstractNotifierEditActionSupport#saveNotifier(ProjectNotifier)
      */
     protected void saveNotifier( ProjectNotifier notifier )
@@ -51,18 +51,18 @@
     {
         boolean isNew = notifier.getId() <= 0;
         if ( !isNew )
-        {            
+        {
             getContinuum().updateGroupNotifier( projectGroupId, notifier );
         }
         else
-        {         
+        {
             getContinuum().addGroupNotifier( projectGroupId, notifier );
         }
     }
 
     /**
      * @return the notifier
-     * @throws ContinuumException 
+     * @throws ContinuumException
      */
     protected ProjectNotifier getNotifier()
         throws ContinuumException

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractNotifierEditActionSupport.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractNotifierEditActionSupport.java?view=diff&rev=499782&r1=499781&r2=499782
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractNotifierEditActionSupport.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractNotifierEditActionSupport.java
Thu Jan 25 05:32:08 2007
@@ -19,17 +19,17 @@
  * under the License.
  */
 
-import java.util.Map;
-
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.web.action.ContinuumActionSupport;
 
+import java.util.Map;
+
 /**
- * Common base class that consolidates the common properties used by extending 
- * <code>XXXEditAction</code> implementations and defines a contract expected
of 
+ * Common base class that consolidates the common properties used by extending
+ * <code>XXXEditAction</code> implementations and defines a contract expected
of
  * the extending clases.
- * 
+ *
  * @author <a href='mailto:rahul.thakur.xdev@gmail.com'>Rahul Thakur</a>
  * @version $Id$
  * @since 1.1
@@ -37,7 +37,6 @@
 public abstract class AbstractNotifierEditActionSupport
     extends ContinuumActionSupport
 {
-
     /**
      * Identifier for the {@link ProjectNotifier} instance being edited.
      */
@@ -62,41 +61,46 @@
 
     /**
      * Detemines if the notifier should fire when build resulted in any error(s).<p>
-     * <code>true</code> implies notifier executes when any error(s) is/are detected

+     * <code>true</code> implies notifier executes when any error(s) is/are detected
      * for the build.
      */
     private boolean sendOnError;
 
     /**
      * Detemines if the notifier should fire when build resulted in any warning(s).<p>
-     * <code>true</code> implies notifier executes when any warning(s) is/are
detected 
+     * <code>true</code> implies notifier executes when any warning(s) is/are
detected
      * for the build.
      */
     private boolean sendOnWarning;
 
     /**
+     * Action name to redirect on SUCCESS.<p>
+     * This is set on the originating page and passed down the edit page.
+     */
+    private String targetRedirectAction;
+
+    /**
      * Obtain and return the {@link ProjectNotifier} instance for editing.
+     *
      * @return {@link ProjectNotifier} instance.
-     * 
-     * @throws ContinuumException if there was error retrieving 
-     *              the target {@link ProjectNotifier} instance.
+     * @throws ContinuumException if there was error retrieving the target {@link ProjectNotifier}
instance.
      */
     protected abstract ProjectNotifier getNotifier()
         throws ContinuumException;
 
     /**
      * Persists update to the {@link ProjectNotifier} instance being edited.
+     *
      * @param notifier {@link ProjectNotifier} to save.
-     * 
-     * @throws ContinuumException if there was an error saving the 
-     *                              {@link ProjectNotifier} instance.
+     * @throws ContinuumException if there was an error saving the
+     *                            {@link ProjectNotifier} instance.
      */
     protected abstract void saveNotifier( ProjectNotifier notifier )
         throws ContinuumException;
 
     /**
      * Creates or updates {@link ProjectNotifier} instance.
-     * 
+     *
      * @return result as String.
      * @throws ContinuumException
      */
@@ -131,7 +135,7 @@
 
     /**
      * Obtains the {@link ProjectNotifier} instance for edit purposes.
-     * 
+     *
      * @return result as String.
      * @throws ContinuumException
      */
@@ -170,7 +174,7 @@
      * @return the notifierType
      */
     public String getNotifierType()
-    {        
+    {
         return notifierType;
     }
 
@@ -178,7 +182,7 @@
      * @param notifierType the notifierType to set
      */
     public void setNotifierType( String notifierType )
-    {        
+    {
         this.notifierType = notifierType;
     }
 
@@ -255,19 +259,35 @@
     }
 
     /**
-     * Initialises the configuration map that the {@link ProjectNotifier} 
+     * @return the targetAction
+     */
+    public String getTargetRedirectAction()
+    {
+        return targetRedirectAction;
+    }
+
+    /**
+     * @param targetAction the targetAction to set
+     */
+    public void setTargetRedirectAction( String targetAction )
+    {
+        this.targetRedirectAction = targetAction;
+    }
+
+    /**
+     * Initialises the configuration map that the {@link ProjectNotifier}
      * instance is to be inited with.
-     * 
+     *
      * @param configuration map of configuration key-value pairs.
      */
     protected abstract void initConfiguration( Map configuration );
 
     /**
-     * Sets the configuration for the specified {@link ProjectNotifier} 
+     * Sets the configuration for the specified {@link ProjectNotifier}
      * instance.
+     *
      * @param notifier
      * @see #initConfiguration(Map)
      */
     protected abstract void setNotifierConfiguration( ProjectNotifier notifier );
-
-}
\ No newline at end of file
+}

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractProjectNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractProjectNotifierEditAction.java?view=diff&rev=499782&r1=499781&r2=499782
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractProjectNotifierEditAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractProjectNotifierEditAction.java
Thu Jan 25 05:32:08 2007
@@ -36,7 +36,7 @@
      * Identifier for the {@link Project} who's {@link ProjectNotifier} is being edited.
      */
     private int projectId;
-    
+
     /**
      * Identifier for the {@link ProjectGroup} instance that the current {@link Project}
is a member of.
      */
@@ -44,9 +44,9 @@
 
     /**
      * Save the notifier for the {@link Project} here.<p>
-     * This is used by the subclasses that create/obtain an instance of 
+     * This is used by the subclasses that create/obtain an instance of
      * {@link ProjectNotifier} to be saved.
-     * 
+     *
      * @see org.apache.maven.continuum.web.action.notifier.AbstractNotifierEditActionSupport#saveNotifier(ProjectNotifier)
      */
     protected void saveNotifier( ProjectNotifier notifier )
@@ -74,7 +74,7 @@
 
     /**
      * Returns the identifier for the current project.
-     * 
+     *
      * @return current project's id.
      */
     public int getProjectId()
@@ -84,17 +84,18 @@
 
     /**
      * Sets the id of the current project for this action.
-     * 
+     *
      * @param projectId current project's id.
      */
     public void setProjectId( int projectId )
     {
         this.projectId = projectId;
     }
-    
+
     /**
-     * Returns the identifier for the {@link ProjectGroup} that the 
+     * Returns the identifier for the {@link ProjectGroup} that the
      * {@link Project} is a member of.
+     *
      * @return the projectGroupId
      */
     public int getProjectGroupId()
@@ -103,8 +104,9 @@
     }
 
     /**
-     * Sets the identifier for the {@link ProjectGroup} that the 
+     * Sets the identifier for the {@link ProjectGroup} that the
      * {@link Project} is a member of.
+     *
      * @param projectGroupId the identifier to set
      */
     public void setProjectGroupId( int projectGroupId )

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddGroupNotifierAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddGroupNotifierAction.java?view=diff&rev=499782&r1=499781&r2=499782
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddGroupNotifierAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddGroupNotifierAction.java
Thu Jan 25 05:32:08 2007
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package org.apache.maven.continuum.web.action.notifier;
 
@@ -27,15 +27,13 @@
 import org.apache.maven.continuum.web.action.ContinuumActionSupport;
 
 /**
- * WW action that sets up a new {@link ProjectNotifier} instance for 
+ * WW action that sets up a new {@link ProjectNotifier} instance for
  * the specified {@link ProjectGroup}.
- * 
+ *
  * @author <a href='mailto:rahul.thakur.xdev@gmail.com'>Rahul Thakur</a>
  * @version $Id$
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addGroupNotifier"
  * @since 1.1
- * @plexus.component 
- *   role="com.opensymphony.xwork.Action" 
- *   role-hint="addGroupNotifier"
  */
 public class AddGroupNotifierAction
     extends ContinuumActionSupport
@@ -52,8 +50,9 @@
     private String notifierType;
 
     /**
-     * Default action method executed in case no method is specified 
+     * Default action method executed in case no method is specified
      * for invocation.
+     *
      * @return a String result that determines the control flow.
      */
     public String execute()
@@ -67,9 +66,9 @@
     }
 
     /**
-     * Returns the type identifier for the {@link ProjectNotifier} being 
+     * Returns the type identifier for the {@link ProjectNotifier} being
      * edited as String.
-     * 
+     *
      * @return notifier type as String.
      */
     public String getNotifierType()
@@ -78,8 +77,9 @@
     }
 
     /**
-     * Sets the notifier type for the {@link ProjectNotifier} instance 
+     * Sets the notifier type for the {@link ProjectNotifier} instance
      * being edited.
+     *
      * @param notifierType notifier type to set.
      */
     public void setNotifierType( String notifierType )
@@ -89,6 +89,7 @@
 
     /**
      * Returns the current {@link ProjectGroup} Identifier.
+     *
      * @return the projectGroupId
      */
     public int getProjectGroupId()
@@ -98,6 +99,7 @@
 
     /**
      * Sets the Id for the target {@link ProjectGroup}.
+     *
      * @param projectGroupId the projectGroupId to set
      */
     public void setProjectGroupId( int projectGroupId )

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java?view=diff&rev=499782&r1=499781&r2=499782
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java
Thu Jan 25 05:32:08 2007
@@ -26,14 +26,11 @@
 
 /**
  * Action to add a {@link ProjectNotifier} for a specified {@link Project}.
- * 
+ *
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id: AddNotifierAction.java 466640 2006-10-22 13:11:30Z jmcconnell $
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addProjectNotifier"
  * @since 1.1
- *
- * @plexus.component 
- *   role="com.opensymphony.xwork.Action" 
- *   role-hint="addProjectNotifier"
  */
 public class AddProjectNotifierAction
     extends ContinuumActionSupport
@@ -42,7 +39,7 @@
      * Identifier for the {@link Project} instance.
      */
     private int projectId;
-    
+
     /**
      * Identifier for the {@link ProjectGroup} instance that the current {@link Project}
is a member of.
      */
@@ -56,6 +53,7 @@
     /**
      * Default method executed when no specific method is specified
      * for invocation.
+     *
      * @return result as a String value to determines the control flow.
      */
     public String execute()
@@ -73,6 +71,7 @@
 
     /**
      * Returns the type for the {@link ProjectNotifier}.
+     *
      * @return Notifier type as String.
      */
     public String getNotifierType()
@@ -82,7 +81,7 @@
 
     /**
      * Sets the type for the {@link ProjectNotifier}.
-     * 
+     *
      * @param notifierType Notifier type to set.
      */
     public void setNotifierType( String notifierType )
@@ -92,7 +91,7 @@
 
     /**
      * Identifier for the Project being edited.
-     * 
+     *
      * @return project id.
      */
     public int getProjectId()
@@ -101,9 +100,9 @@
     }
 
     /**
-     * Sets the identifier for the Project to be edited for 
+     * Sets the identifier for the Project to be edited for
      * project notifiers.
-     * 
+     *
      * @param projectId
      */
     public void setProjectId( int projectId )
@@ -112,8 +111,9 @@
     }
 
     /**
-     * Returns the identifier for the {@link ProjectGroup} that the 
+     * Returns the identifier for the {@link ProjectGroup} that the
      * {@link Project} is a member of.
+     *
      * @return the projectGroupId
      */
     public int getProjectGroupId()
@@ -122,13 +122,14 @@
     }
 
     /**
-     * Sets the identifier for the {@link ProjectGroup} that the 
+     * Sets the identifier for the {@link ProjectGroup} that the
      * {@link Project} is a member of.
+     *
      * @param projectGroupId the identifier to set
      */
     public void setProjectGroupId( int projectGroupId )
     {
         this.projectGroupId = projectGroupId;
     }
-    
+
 }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteGroupNotifierAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteGroupNotifierAction.java?view=diff&rev=499782&r1=499781&r2=499782
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteGroupNotifierAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteGroupNotifierAction.java
Thu Jan 25 05:32:08 2007
@@ -19,34 +19,32 @@
  * under the License.
  */
 
-import java.util.Map;
-
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.web.action.ContinuumActionSupport;
 
+import java.util.Map;
+
 /**
- * Action to delete a {@link ProjectNotifier} instance from a 
+ * Action to delete a {@link ProjectNotifier} instance from a
  * specified {@link ProjectGroup}.
- * 
+ *
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id: DeleteNotifierAction.java 467122 2006-10-23 20:50:19Z jmcconnell $
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="deleteGroupNotifier"
  * @since 1.1
- * @plexus.component 
- *   role="com.opensymphony.xwork.Action"  
- *   role-hint="deleteGroupNotifier"
  */
 public class DeleteGroupNotifierAction
     extends ContinuumActionSupport
 {
 
     private int projectGroupId;
-    
+
     private int notifierId;
 
     private String notifierType;
-    
+
     private String recipient;
 
     public String execute()
@@ -60,30 +58,29 @@
         throws ContinuumException
     {
         ProjectNotifier notifier = getContinuum().getGroupNotifier( projectGroupId, notifierId
);
-        
+
         Map configuration = notifier.getConfiguration();
-        
+
         notifierType = notifier.getType();
-        
-        if ( ( "mail".equals( notifierType ) ) || 
-             ( "msn".equals( notifierType ) ) ||
-             ( "jabber".equals( notifierType ) ) )
+
+        if ( ( "mail".equals( notifierType ) ) || ( "msn".equals( notifierType ) ) ||
+            ( "jabber".equals( notifierType ) ) )
         {
             recipient = (String) configuration.get( "address" );
         }
-        
+
         if ( "irc".equals( notifierType ) )
         {
             recipient = (String) configuration.get( "host" );
-            
+
             if ( configuration.get( "port" ) != null )
             {
                 recipient = recipient + ":" + (String) configuration.get( "port" );
             }
-                
+
             recipient = recipient + ":" + (String) configuration.get( "channel" );
         }
-        
+
         return "delete";
     }
 
@@ -122,7 +119,7 @@
     {
         this.projectGroupId = projectGroupId;
     }
-    
+
     public int getProjectId()
     {
         //flags that this is a group notifier

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteProjectNotifierAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteProjectNotifierAction.java?view=diff&rev=499782&r1=499781&r2=499782
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteProjectNotifierAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteProjectNotifierAction.java
Thu Jan 25 05:32:08 2007
@@ -28,14 +28,14 @@
 import java.util.Map;
 
 /**
- * Action that deletes a {@link ProjectNotifier} of type 'IRC' from the specified {@link
ProjectGroup}.
- * 
+ * Action that deletes a {@link ProjectNotifier} from a specified {@link Project}.
+ *
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id: DeleteNotifierAction.java 467122 2006-10-23 20:50:19Z jmcconnell $
- * 
  * @plexus.component role="com.opensymphony.xwork.Action" role-hint="deleteProjectNotifier"
  */
-public class DeleteProjectNotifierAction extends ContinuumActionSupport
+public class DeleteProjectNotifierAction
+    extends ContinuumActionSupport
 {
 
     private int projectId;
@@ -48,43 +48,43 @@
     private int notifierId;
 
     private String notifierType;
-    
-    private String recipient;    
 
-	public String execute() throws ContinuumException
+    private String recipient;
+
+    public String execute()
+        throws ContinuumException
     {
         getContinuum().removeNotifier( projectId, notifierId );
         return SUCCESS;
     }
 
     public String doDefault()
-    	throws ContinuumException
+        throws ContinuumException
     {
-    	ProjectNotifier notifier = getContinuum().getNotifier( projectId, notifierId );
-    	
-    	Map configuration = notifier.getConfiguration();
-    	
-    	notifierType = notifier.getType();
-    	
-    	if ( ( "mail".equals( notifierType ) ) || 
-    		 ( "msn".equals( notifierType ) ) ||
-    		 ( "jabber".equals( notifierType ) ) )
-    	{
-    		recipient = (String) configuration.get( "address" );
-    	}
-    	
-    	if ( "irc".equals( notifierType ) )
-    	{
-    		recipient = (String) configuration.get( "host" );
-    		
-    		if ( configuration.get( "port" ) != null )
-    		{
-    			recipient = recipient + ":" + (String) configuration.get( "port" );
-    		}
-        		
-    		recipient = recipient + ":" + (String) configuration.get( "channel" );
-		}
-    	
+        ProjectNotifier notifier = getContinuum().getNotifier( projectId, notifierId );
+
+        Map configuration = notifier.getConfiguration();
+
+        notifierType = notifier.getType();
+
+        if ( ( "mail".equals( notifierType ) ) || ( "msn".equals( notifierType ) ) ||
+            ( "jabber".equals( notifierType ) ) )
+        {
+            recipient = (String) configuration.get( "address" );
+        }
+
+        if ( "irc".equals( notifierType ) )
+        {
+            recipient = (String) configuration.get( "host" );
+
+            if ( configuration.get( "port" ) != null )
+            {
+                recipient = recipient + ":" + (String) configuration.get( "port" );
+            }
+
+            recipient = recipient + ":" + (String) configuration.get( "channel" );
+        }
+
         return "delete";
     }
 
@@ -127,15 +127,15 @@
     {
         this.projectGroupId = projectGroupId;
     }
-    
+
     public String getRecipient()
     {
-		return recipient;
-	}
+        return recipient;
+    }
 
-	public void setRecipient(String recipient)
-	{
-		this.recipient = recipient;
-	}
+    public void setRecipient( String recipient )
+    {
+        this.recipient = recipient;
+    }
 
 }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.java?view=diff&rev=499782&r1=499781&r2=499782
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.java
Thu Jan 25 05:32:08 2007
@@ -26,16 +26,13 @@
 import java.util.Map;
 
 /**
- * Action that deletes a {@link ProjectNotifier} of type 'IRC' from the 
+ * Action that edits a {@link ProjectNotifier} of type 'IRC' from the
  * specified {@link ProjectGroup}.
- * 
+ *
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id: IrcNotifierEditAction.java 465060 2006-10-17 21:24:38Z jmcconnell $
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="ircGroupNotifierEdit"
  * @since 1.1
- *
- * @plexus.component
- *   role="com.opensymphony.xwork.Action"
- *   role-hint="ircGroupNotifierEdit"
  */
 public class IrcGroupNotifierEditAction
     extends AbstractGroupNotifierEditAction

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.java?view=diff&rev=499782&r1=499781&r2=499782
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.java
Thu Jan 25 05:32:08 2007
@@ -27,10 +27,7 @@
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
- *
- * @plexus.component
- *   role="com.opensymphony.xwork.Action"
- *   role-hint="ircProjectNotifierEdit"
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="ircProjectNotifierEdit"
  */
 public class IrcProjectNotifierEditAction
     extends AbstractProjectNotifierEditAction

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java?view=diff&rev=499782&r1=499781&r2=499782
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java
Thu Jan 25 05:32:08 2007
@@ -26,16 +26,13 @@
 import java.util.Map;
 
 /**
- * Action that deletes a {@link ProjectNotifier} of type 'Jabber' from the 
+ * Action that edits a {@link ProjectNotifier} of type 'Jabber' from the
  * specified {@link ProjectGroup}.
- * 
+ *
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id: JabberNotifierEditAction.java 465060 2006-10-17 21:24:38Z jmcconnell $
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="jabberGroupNotifierEdit"
  * @since 1.1
- * 
- * @plexus.component
- *   role="com.opensymphony.xwork.Action"
- *   role-hint="jabberGroupNotifierEdit"
  */
 public class JabberGroupNotifierEditAction
     extends AbstractGroupNotifierEditAction

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java?view=diff&rev=499782&r1=499781&r2=499782
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java
Thu Jan 25 05:32:08 2007
@@ -26,14 +26,12 @@
 import java.util.Map;
 
 /**
- * Action that deletes a {@link ProjectNotifier} of type 'Jabber' from the 
+ * Action that edits a {@link ProjectNotifier} of type 'Jabber' from the
  * specified {@link Project}.
+ *
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id: JabberNotifierEditAction.java 465060 2006-10-17 21:24:38Z jmcconnell $
- *
- * @plexus.component
- *   role="com.opensymphony.xwork.Action"
- *   role-hint="jabberProjectNotifierEdit"
+ * @plexus.component role="com.opensymphony.xwork.Action"role-hint="jabberProjectNotifierEdit"
  */
 public class JabberProjectNotifierEditAction
     extends AbstractProjectNotifierEditAction

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.java?view=diff&rev=499782&r1=499781&r2=499782
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.java
Thu Jan 25 05:32:08 2007
@@ -19,23 +19,20 @@
  * under the License.
  */
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.model.project.ProjectNotifier;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
- * Action that deletes a {@link ProjectNotifier} of type 'Mail' from the 
+ * Action that edits a {@link ProjectNotifier} of type 'Mail' from the
  * specified {@link ProjectGroup}.
- * 
+ *
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id: MailNotifierEditAction.java 465060 2006-10-17 21:24:38Z jmcconnell $
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="mailGroupNotifierEdit"
  * @since 1.1
- * 
- * @plexus.component
- *   role="com.opensymphony.xwork.Action"
- *   role-hint="mailGroupNotifierEdit"
  */
 public class MailGroupNotifierEditAction
     extends AbstractGroupNotifierEditAction

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.java?view=diff&rev=499782&r1=499781&r2=499782
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.java
Thu Jan 25 05:32:08 2007
@@ -19,23 +19,20 @@
  * under the License.
  */
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.project.ProjectNotifier;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
- * Action that deletes a {@link ProjectNotifier} of type 'Mail' from the 
+ * Action that edits a {@link ProjectNotifier} of type 'Mail' from the
  * specified {@link Project}.
- * 
+ *
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id: MailNotifierEditAction.java 465060 2006-10-17 21:24:38Z jmcconnell $
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="mailProjectNotifierEdit"
  * @since 1.1
- * 
- * @plexus.component
- *   role="com.opensymphony.xwork.Action"
- *   role-hint="mailProjectNotifierEdit"
  */
 public class MailProjectNotifierEditAction
     extends AbstractProjectNotifierEditAction

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.java?view=diff&rev=499782&r1=499781&r2=499782
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.java
Thu Jan 25 05:32:08 2007
@@ -26,15 +26,12 @@
 import java.util.Map;
 
 /**
- * Action that deletes a {@link ProjectNotifier} of type 'MSN' from the 
+ * Action that edits a {@link ProjectNotifier} of type 'MSN' from the
  * specified {@link ProjectGroup}.
- * 
+ *
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id: MsnNotifierEditAction.java 465060 2006-10-17 21:24:38Z jmcconnell $
- *
- * @plexus.component
- *   role="com.opensymphony.xwork.Action"
- *   role-hint="msnGroupNotifierEdit"
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="msnGroupNotifierEdit"
  */
 public class MsnGroupNotifierEditAction
     extends AbstractGroupNotifierEditAction

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.java?view=diff&rev=499782&r1=499781&r2=499782
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.java
Thu Jan 25 05:32:08 2007
@@ -19,23 +19,20 @@
  * under the License.
  */
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.project.ProjectNotifier;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
- * Action that deletes a {@link ProjectNotifier} of type 'MSN' from the 
+ * Action that edits a {@link ProjectNotifier} of type 'MSN' from the
  * specified {@link Project}.
- * 
+ *
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id: MsnNotifierEditAction.java 465060 2006-10-17 21:24:38Z jmcconnell $
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="msnProjectNotifierEdit"
  * @since 1.1
- * 
- * @plexus.component
- *   role="com.opensymphony.xwork.Action"
- *   role-hint="msnProjectNotifierEdit"
  */
 public class MsnProjectNotifierEditAction
     extends AbstractProjectNotifierEditAction

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction.java?view=diff&rev=499782&r1=499781&r2=499782
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction.java
Thu Jan 25 05:32:08 2007
@@ -19,33 +19,30 @@
  * under the License.
  */
 
-import java.util.Map;
-import java.util.HashMap;
-
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.model.project.ProjectNotifier;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
- * Action that deletes a {@link ProjectNotifier} of type 'Wagon' from the 
+ * Action that edits a {@link ProjectNotifier} of type 'Wagon' from the
  * specified {@link ProjectGroup}.
- * 
+ *
  * @author <a href="mailto:hisidro@exist.com">Henry Isidro</a>
- * 
- * @plexus.component
- *   role="com.opensymphony.xwork.Action"
- *   role-hint="wagonGroupNotifierEdit"
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="wagonGroupNotifierEdit"
  */
 
 public class WagonGroupNotifierEditAction
     extends AbstractGroupNotifierEditAction
 {
     private String url;
-    
+
     protected void initConfiguration( Map configuration )
-    {     
+    {
         url = (String) configuration.get( "url" );
     }
-    
+
     protected void setNotifierConfiguration( ProjectNotifier notifier )
     {
         HashMap configuration = new HashMap();
@@ -55,12 +52,12 @@
         notifier.setConfiguration( configuration );
     }
 
-    public String getUrl() 
+    public String getUrl()
     {
         return url;
     }
 
-    public void setUrl( String url ) 
+    public void setUrl( String url )
     {
         this.url = url;
     }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonProjectNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonProjectNotifierEditAction.java?view=diff&rev=499782&r1=499781&r2=499782
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonProjectNotifierEditAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonProjectNotifierEditAction.java
Thu Jan 25 05:32:08 2007
@@ -19,33 +19,30 @@
  * under the License.
  */
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.project.ProjectNotifier;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
- * Action that deletes a {@link ProjectNotifier} of type 'Wagon' from the 
+ * Action that edits a {@link ProjectNotifier} of type 'Wagon' from the
  * specified {@link Project}.
- * 
+ *
  * @author <a href="mailto:hisidro@exist.com">Henry Isidro</a>
- * 
- * @plexus.component
- *   role="com.opensymphony.xwork.Action"
- *   role-hint="wagonProjectNotifierEdit"
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="wagonProjectNotifierEdit"
  */
 
-public class WagonProjectNotifierEditAction 
+public class WagonProjectNotifierEditAction
     extends AbstractProjectNotifierEditAction
 {
-private String url;
-    
+    private String url;
+
     protected void initConfiguration( Map configuration )
-    {     
+    {
         url = (String) configuration.get( "url" );
     }
-    
+
     protected void setNotifierConfiguration( ProjectNotifier notifier )
     {
         HashMap configuration = new HashMap();
@@ -55,12 +52,12 @@
         notifier.setConfiguration( configuration );
     }
 
-    public String getUrl() 
+    public String getUrl()
     {
         return url;
     }
 
-    public void setUrl( String url ) 
+    public void setUrl( String url )
     {
         this.url = url;
     }



Mime
View raw message