Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 92964 invoked from network); 15 Jan 2006 00:36:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 15 Jan 2006 00:36:10 -0000 Received: (qmail 39610 invoked by uid 500); 15 Jan 2006 00:36:10 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 39583 invoked by uid 500); 15 Jan 2006 00:36:09 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 39572 invoked by uid 99); 15 Jan 2006 00:36:09 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Jan 2006 16:36:09 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 14 Jan 2006 16:36:08 -0800 Received: (qmail 92938 invoked by uid 65534); 15 Jan 2006 00:35:48 -0000 Message-ID: <20060115003548.92937.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r369133 - in /maven/continuum/trunk/continuum-webapp: ./ src/main/java/org/apache/maven/continuum/web/action/ src/main/java/org/apache/maven/continuum/web/rememberme/ src/main/java/org/apache/maven/continuum/web/view/ src/main/java/org/apac... Date: Sun, 15 Jan 2006 00:35:44 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: evenisse Date: Sat Jan 14 16:35:41 2006 New Revision: 369133 URL: http://svn.apache.org/viewcvs?rev=369133&view=rev Log: Clean imports Modified: maven/continuum/trunk/continuum-webapp/ (props changed) maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/rememberme/DefaultRememberMeServices.java maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierEventCell.java maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierFromCell.java maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierRecipientCell.java Propchange: maven/continuum/trunk/continuum-webapp/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sat Jan 14 16:35:41 2006 @@ -1 +1,4 @@ target +.classpath +.project +.wtpmodules Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java?rev=369133&r1=369132&r2=369133&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java Sat Jan 14 16:35:41 2006 @@ -20,11 +20,10 @@ import org.apache.maven.continuum.ContinuumException; import org.apache.maven.continuum.model.project.ProjectNotifier; -import com.opensymphony.xwork.ActionSupport; - -import java.util.HashMap; import java.util.Map; +import com.opensymphony.xwork.ActionSupport; + /** * @author Emmanuel Venisse * @version $Id$ @@ -45,7 +44,7 @@ private boolean sendOnSuccess; private boolean sendOnFailure; - + private boolean sendOnError; private boolean sendOnWarning; @@ -88,7 +87,8 @@ } catch ( ContinuumException e ) { - addActionMessage( "Can't update notifier (id=" + notifierId + ") for project " + projectId + " : " + e.getMessage() ); + addActionMessage( "Can't update notifier (id=" + notifierId + ") for project " + projectId + " : " + + e.getMessage() ); e.printStackTrace(); @@ -111,7 +111,8 @@ } catch ( ContinuumException e ) { - addActionMessage( "Can't get notifier informations (id=" + notifierId + ") for project " + projectId + " : " + e.getMessage() ); + addActionMessage( "Can't get notifier informations (id=" + notifierId + ") for project " + projectId + + " : " + e.getMessage() ); e.printStackTrace(); Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java?rev=369133&r1=369132&r2=369133&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java Sat Jan 14 16:35:41 2006 @@ -18,18 +18,16 @@ import org.apache.maven.continuum.Continuum; import org.apache.maven.continuum.ContinuumException; -import org.apache.maven.continuum.model.project.BuildDefinition; -import org.apache.maven.continuum.model.project.Profile; import org.apache.maven.continuum.model.project.Project; import org.apache.maven.continuum.model.project.Schedule; -import com.opensymphony.xwork.ActionSupport; - import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import com.opensymphony.xwork.ActionSupport; + /** * @author Emmanuel Venisse * @version $Id$ @@ -59,7 +57,7 @@ private Map schedulesMap; -// private Profile profile; + // private Profile profile; public String execute() { @@ -110,12 +108,6 @@ } } - private BuildDefinition getBuildDefinition() - throws ContinuumException - { - return continuum.getBuildDefinition( projectId, buildDefinitionId ); - } - public Project getProject() { return project; @@ -209,7 +201,7 @@ { initSchedulesMap(); } - catch( ContinuumException e ) + catch ( ContinuumException e ) { } } Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java?rev=369133&r1=369132&r2=369133&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java Sat Jan 14 16:35:41 2006 @@ -18,17 +18,13 @@ import org.apache.maven.continuum.Continuum; import org.apache.maven.continuum.ContinuumException; -import org.apache.maven.continuum.model.project.Project; import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringUtils; -import com.opensymphony.xwork.ActionSupport; - import java.io.File; -import java.io.IOException; import java.net.MalformedURLException; -import java.net.URL; + +import com.opensymphony.xwork.ActionSupport; /** * @author Nick Gonzalez Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java?rev=369133&r1=369132&r2=369133&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java Sat Jan 14 16:35:41 2006 @@ -18,24 +18,20 @@ import org.apache.maven.continuum.Continuum; import org.apache.maven.continuum.ContinuumException; -import org.apache.maven.continuum.model.project.Project; import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringUtils; -import com.opensymphony.xwork.ActionSupport; - import java.io.File; -import java.io.IOException; import java.net.MalformedURLException; -import java.net.URL; + +import com.opensymphony.xwork.ActionSupport; /** * @author Nick Gonzalez * @version $Id$ */ -public class AddMavenTwoProjectAction - extends ActionSupport +public class AddMavenTwoProjectAction + extends ActionSupport { private Continuum continuum; @@ -80,8 +76,8 @@ { return INPUT; } - - if( result.getWarnings().size() > 0 ) + + if ( result.getWarnings().size() > 0 ) { addActionMessage( result.getWarnings().toArray().toString() ); @@ -96,7 +92,8 @@ return INPUT; } - public File getM2PomFile() { + public File getM2PomFile() + { return m2PomFile; } Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java?rev=369133&r1=369132&r2=369133&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java Sat Jan 14 16:35:41 2006 @@ -20,11 +20,8 @@ import org.apache.maven.continuum.ContinuumException; import org.apache.maven.continuum.model.project.Project; -import com.opensymphony.webwork.ServletActionContext; import com.opensymphony.xwork.ActionSupport; -import java.util.Map; - /** * @author Nick Gonzalez * @version $Id$ @@ -47,7 +44,7 @@ private String projectScmTag; private String projectType; - + public String execute() { Project project = new Project(); @@ -111,7 +108,8 @@ this.projectScmTag = projectScmTag; } - public String getProjectScmUrl() { + public String getProjectScmUrl() + { return projectScmUrl; } Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java?rev=369133&r1=369132&r2=369133&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java Sat Jan 14 16:35:41 2006 @@ -30,8 +30,6 @@ { private Continuum continuum; - private int scheduleId; - private boolean active = true; private String cronExpression; @@ -107,10 +105,4 @@ { this.name = name; } - - public void setScheduleId( int scheduleId ) - { - this.scheduleId = scheduleId; - } - } Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java?rev=369133&r1=369132&r2=369133&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java Sat Jan 14 16:35:41 2006 @@ -19,17 +19,16 @@ import org.apache.maven.continuum.Continuum; import org.apache.maven.continuum.ContinuumException; import org.apache.maven.continuum.model.project.BuildDefinition; -import org.apache.maven.continuum.model.project.Profile; import org.apache.maven.continuum.model.project.Project; import org.apache.maven.continuum.model.project.Schedule; -import com.opensymphony.xwork.ActionSupport; - import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import com.opensymphony.xwork.ActionSupport; + /** * @author Emmanuel Venisse * @version $Id$ @@ -61,7 +60,7 @@ private Map schedulesMap; -// private Profile profile; + // private Profile profile; public String execute() { @@ -101,7 +100,8 @@ } catch ( ContinuumException e ) { - addActionMessage( "Can't update build definition (id=" + buildDefinitionId + ") for project " + projectId + " : " + e.getMessage() ); + addActionMessage( "Can't update build definition (id=" + buildDefinitionId + ") for project " + projectId + + " : " + e.getMessage() ); e.printStackTrace(); @@ -121,7 +121,8 @@ } catch ( ContinuumException e ) { - addActionMessage( "Can't get build definition informations (id=" + buildDefinitionId + ") for project " + projectId + " : " + e.getMessage() ); + addActionMessage( "Can't get build definition informations (id=" + buildDefinitionId + ") for project " + + projectId + " : " + e.getMessage() ); e.printStackTrace(); @@ -153,7 +154,7 @@ return ERROR; } -// profile = bd.getProfile(); + // profile = bd.getProfile(); return INPUT; } @@ -275,7 +276,7 @@ { initSchedulesMap(); } - catch( ContinuumException e ) + catch ( ContinuumException e ) { } } Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java?rev=369133&r1=369132&r2=369133&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java Sat Jan 14 16:35:41 2006 @@ -18,12 +18,8 @@ import org.apache.maven.continuum.Continuum; import org.apache.maven.continuum.ContinuumException; -import org.apache.maven.continuum.model.project.Project; -import com.opensymphony.webwork.ServletActionContext; import com.opensymphony.xwork.ActionSupport; - -import java.util.Map; /** * @author Emmanuel Venisse Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java?rev=369133&r1=369132&r2=369133&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java Sat Jan 14 16:35:41 2006 @@ -20,11 +20,10 @@ import org.apache.maven.continuum.ContinuumException; import org.apache.maven.continuum.model.project.BuildResult; -import com.opensymphony.xwork.ActionSupport; - -import java.util.Collection; import java.util.List; +import com.opensymphony.xwork.ActionSupport; + /** * @author Emmanuel Venisse * @version $Id$ @@ -54,7 +53,8 @@ } catch ( ContinuumException e ) { - addActionError( "Can't get build result (id=" + buildId + ") for project (id=" + projectId + ") : " + e.getMessage() ); + addActionError( "Can't get build result (id=" + buildId + ") for project (id=" + projectId + ") : " + + e.getMessage() ); e.printStackTrace(); Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java?rev=369133&r1=369132&r2=369133&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java Sat Jan 14 16:35:41 2006 @@ -18,11 +18,8 @@ import org.apache.maven.continuum.Continuum; import org.apache.maven.continuum.configuration.ConfigurationStoringException; -import org.codehaus.plexus.util.StringUtils; import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; import com.opensymphony.xwork.ActionSupport; import com.opensymphony.xwork.Preparable; Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java?rev=369133&r1=369132&r2=369133&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java Sat Jan 14 16:35:41 2006 @@ -19,16 +19,15 @@ import org.codehaus.plexus.rememberme.RememberMeServices; import org.codehaus.plexus.security.Authentication; import org.codehaus.plexus.security.Authenticator; -import org.codehaus.plexus.security.DefaultAuthentication; -import org.codehaus.plexus.security.User; - -import com.opensymphony.xwork.ActionSupport; -import com.opensymphony.webwork.ServletActionContext; import java.util.HashMap; import java.util.Map; + import javax.servlet.http.HttpSession; +import com.opensymphony.webwork.ServletActionContext; +import com.opensymphony.xwork.ActionSupport; + /** * @author Emmanuel Venisse * @version $Id$ @@ -66,8 +65,8 @@ if ( rememberMe ) { - rememberMeServices.loginSuccess( ServletActionContext.getRequest(), - ServletActionContext.getResponse(), auth ); + rememberMeServices.loginSuccess( ServletActionContext.getRequest(), ServletActionContext.getResponse(), + auth ); } HttpSession session = ServletActionContext.getRequest().getSession( true ); @@ -84,8 +83,7 @@ if ( rememberMe ) { - rememberMeServices.loginFail( ServletActionContext.getRequest(), - ServletActionContext.getResponse() ); + rememberMeServices.loginFail( ServletActionContext.getRequest(), ServletActionContext.getResponse() ); } return INPUT; Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/rememberme/DefaultRememberMeServices.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/rememberme/DefaultRememberMeServices.java?rev=369133&r1=369132&r2=369133&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/rememberme/DefaultRememberMeServices.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/rememberme/DefaultRememberMeServices.java Sat Jan 14 16:35:41 2006 @@ -25,7 +25,7 @@ import com.opensymphony.user.EntityNotFoundException; /** - * @author Emmanuel Venisse + * @author Emmanuel Venisse * @version $Id$ */ public class DefaultRememberMeServices Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java?rev=369133&r1=369132&r2=369133&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java Sat Jan 14 16:35:41 2006 @@ -17,19 +17,17 @@ */ import org.apache.maven.continuum.web.model.SummaryProjectModel; -import org.apache.maven.continuum.web.util.StateGenerator; - import org.extremecomponents.table.bean.Column; import org.extremecomponents.table.cell.DisplayCell; import org.extremecomponents.table.core.BaseModel; -import com.opensymphony.webwork.views.util.UrlHelper; - import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.opensymphony.webwork.views.util.UrlHelper; + /** * Used in Summary view * @@ -39,9 +37,9 @@ public class BuildCell extends DisplayCell { - public void init(BaseModel model, Column column) + public void init( BaseModel model, Column column ) { - super.init(model, column); + super.init( model, column ); SummaryProjectModel project = (SummaryProjectModel) model.getCurrentCollectionBean(); @@ -51,7 +49,8 @@ { column.setValue( "In queue" ); } - else if ( project.getState() == 1 || project.getState() == 2 || project.getState() == 3 || project.getState() == 4 ) + else if ( project.getState() == 1 || project.getState() == 2 || project.getState() == 3 + || project.getState() == 4 ) { if ( project.getBuildNumber() > 0 ) { Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java?rev=369133&r1=369132&r2=369133&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java Sat Jan 14 16:35:41 2006 @@ -17,8 +17,6 @@ */ import org.apache.maven.continuum.web.model.SummaryProjectModel; -import org.apache.maven.continuum.web.util.StateGenerator; - import org.extremecomponents.table.bean.Column; import org.extremecomponents.table.cell.DisplayCell; import org.extremecomponents.table.core.BaseModel; @@ -34,17 +32,19 @@ public class BuildNowCell extends DisplayCell { - public void init(BaseModel model, Column column) + public void init( BaseModel model, Column column ) { - super.init(model, column); + super.init( model, column ); SummaryProjectModel project = (SummaryProjectModel) model.getCurrentCollectionBean(); HttpServletRequest request = (HttpServletRequest) model.getPageContext().getRequest(); - if ( !project.isInQueue() && ( project.getState() == 1 || project.getState() == 2 || project.getState() == 3 || project.getState() == 4 ) ) + if ( !project.isInQueue() + && ( project.getState() == 1 || project.getState() == 2 || project.getState() == 3 || project.getState() == 4 ) ) { - column.setValue( "Build Now" ); + column.setValue( "Build Now" ); } } } Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierEventCell.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierEventCell.java?rev=369133&r1=369132&r2=369133&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierEventCell.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierEventCell.java Sat Jan 14 16:35:41 2006 @@ -17,13 +17,10 @@ */ import org.apache.maven.continuum.model.project.ProjectNotifier; - import org.extremecomponents.table.bean.Column; import org.extremecomponents.table.cell.DisplayCell; import org.extremecomponents.table.core.BaseModel; -import javax.servlet.http.HttpServletRequest; - /** * Used in Project view * @@ -33,9 +30,9 @@ public class NotifierEventCell extends DisplayCell { - public void init(BaseModel model, Column column) + public void init( BaseModel model, Column column ) { - super.init(model, column); + super.init( model, column ); ProjectNotifier notifier = (ProjectNotifier) model.getCurrentCollectionBean(); Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierFromCell.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierFromCell.java?rev=369133&r1=369132&r2=369133&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierFromCell.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierFromCell.java Sat Jan 14 16:35:41 2006 @@ -17,13 +17,10 @@ */ import org.apache.maven.continuum.model.project.ProjectNotifier; - import org.extremecomponents.table.bean.Column; import org.extremecomponents.table.cell.DisplayCell; import org.extremecomponents.table.core.BaseModel; -import javax.servlet.http.HttpServletRequest; - /** * Used in Project view * @@ -33,9 +30,9 @@ public class NotifierFromCell extends DisplayCell { - public void init(BaseModel model, Column column) + public void init( BaseModel model, Column column ) { - super.init(model, column); + super.init( model, column ); ProjectNotifier notifier = (ProjectNotifier) model.getCurrentCollectionBean(); Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierRecipientCell.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierRecipientCell.java?rev=369133&r1=369132&r2=369133&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierRecipientCell.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierRecipientCell.java Sat Jan 14 16:35:41 2006 @@ -17,13 +17,10 @@ */ import org.apache.maven.continuum.model.project.ProjectNotifier; - import org.extremecomponents.table.bean.Column; import org.extremecomponents.table.cell.DisplayCell; import org.extremecomponents.table.core.BaseModel; -import javax.servlet.http.HttpServletRequest; - /** * Used in Project view * @@ -33,9 +30,9 @@ public class NotifierRecipientCell extends DisplayCell { - public void init(BaseModel model, Column column) + public void init( BaseModel model, Column column ) { - super.init(model, column); + super.init( model, column ); ProjectNotifier notifier = (ProjectNotifier) model.getCurrentCollectionBean();