You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ba...@apache.org on 2015/04/06 06:27:40 UTC
svn commit: r1671480 - in /continuum/trunk/continuum-webapp/src/main:
java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java
resources/localization/Continuum.properties
Author: batkinson
Date: Mon Apr 6 04:27:39 2015
New Revision: 1671480
URL: http://svn.apache.org/r1671480
Log:
Added feedback when removing local repositories.
Modified:
continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java
continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java?rev=1671480&r1=1671479&r2=1671480&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java Mon Apr 6 04:27:39 2015
@@ -209,25 +209,22 @@ public class LocalRepositoryAction
{
addActionError( getText( "repository.error.remove.in.use",
"Unable to remove local repository because it is in use" ) );
+ return ERROR;
}
if ( repository.getName().equals( "DEFAULT" ) )
{
addActionError( getText( "repository.error.remove.default", "Unable to remove default local repository" ) );
+ return ERROR;
}
- if ( !hasActionErrors() )
+ if ( !confirmed )
{
- if ( confirmed )
- {
- repositoryService.removeLocalRepository( repository.getId() );
- }
- else
- {
- return CONFIRM;
- }
+ return CONFIRM;
}
+ repositoryService.removeLocalRepository( repository.getId() );
+ addActionMessage( getText( "repository.remove.success" ) );
return SUCCESS;
}
Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=1671480&r1=1671479&r2=1671480&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Mon Apr 6 04:27:39 2015
@@ -1017,6 +1017,7 @@ repository.error.purge.in.use = Unable t
repository.error.remove.default = Cannot remove default local repository
repository.error.not.found = Local repository with id={0} was not found.
repository.purge.success = Repository purge successfully requested.
+repository.remove.success = Successfully removed repository.
#-----------------------------------------------------------------------
# Page: Delete Local Repository