You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2008/12/18 16:06:11 UTC
svn commit: r727734 -
/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/gui/impl/GUIManagerImpl.java
Author: andreas
Date: Thu Dec 18 07:06:10 2008
New Revision: 727734
URL: http://svn.apache.org/viewvc?rev=727734&view=rev
Log:
[minor change] Refactoring (code simplification).
Modified:
lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/gui/impl/GUIManagerImpl.java
Modified: lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/gui/impl/GUIManagerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/gui/impl/GUIManagerImpl.java?rev=727734&r1=727733&r2=727734&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/gui/impl/GUIManagerImpl.java (original)
+++ lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/gui/impl/GUIManagerImpl.java Thu Dec 18 07:06:10 2008
@@ -143,6 +143,12 @@
AccessController accessController = null;
UsecaseResolver usecaseResolver = null;
UsecaseAuthorizer authorizer = null;
+
+ String usecaseName = tab.getUsecase();
+ if (usecaseName == null) {
+ throw new IllegalArgumentException("The usecase name of the tab [" + tab.getName() + "] is null.");
+ }
+
try {
selector = (ServiceSelector) this.manager.lookup(AccessControllerResolver.ROLE
@@ -180,7 +186,7 @@
Publication pub = PublicationUtil.getPublicationFromUrl(this.manager,
factory,
this.webappUrl);
- if (!authorizer.authorizeUsecase(tab.getUsecase(), this.roles, pub)) {
+ if (!authorizer.authorizeUsecase(usecaseName, this.roles, pub)) {
if (getLogger().isDebugEnabled()) {
getLogger().debug("Usecase not authorized");
}
@@ -189,10 +195,10 @@
}
}
- if (usecaseResolver.isRegistered(this.webappUrl, tab.getUsecase())) {
+ if (usecaseResolver.isRegistered(this.webappUrl, usecaseName)) {
Usecase usecase = null;
try {
- usecase = usecaseResolver.resolve(this.webappUrl, tab.getUsecase());
+ usecase = usecaseResolver.resolve(this.webappUrl, usecaseName);
usecase.setSourceURL(this.webappUrl);
usecase.setName(tab.getUsecase());
String[] keys = tab.getParameterNames();
@@ -217,8 +223,8 @@
}
} else {
messages = new UsecaseMessage[1];
- messages[0] = new UsecaseMessage("Usecase [" + tab.getUsecase()
- + "] is not registered!", null);
+ String[] params = {};
+ messages[0] = new UsecaseMessage("Usecase [" + usecaseName + "] is not registered!", params);
}
} catch (final Exception e) {
throw new RuntimeException(e);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org