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 2005/02/23 23:38:48 UTC
svn commit: r155095 - in
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases: ChangeLabel.java
ChangeNodeID.java CreateLanguage.java DeleteLanguage.java
Author: andreas
Date: Wed Feb 23 14:38:47 2005
New Revision: 155095
URL: http://svn.apache.org/viewcvs?view=rev&rev=155095
Log:
improved preconditions for site usecases
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/ChangeLabel.java
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/ChangeNodeID.java
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateLanguage.java
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/DeleteLanguage.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/ChangeLabel.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/ChangeLabel.java?view=diff&r1=155094&r2=155095
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/ChangeLabel.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/ChangeLabel.java Wed Feb 23 14:38:47 2005
@@ -37,7 +37,9 @@
*/
protected void doCheckPreconditions() throws Exception {
super.doCheckPreconditions();
-
+ if (!getErrorMessages().isEmpty()) {
+ return;
+ }
if (!getSourceDocument().getArea().equals(Publication.AUTHORING_AREA)) {
addErrorMessage("This usecase can only be invoked in the authoring area!");
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/ChangeNodeID.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/ChangeNodeID.java?view=diff&r1=155094&r2=155095
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/ChangeNodeID.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/ChangeNodeID.java Wed Feb 23 14:38:47 2005
@@ -48,6 +48,9 @@
*/
protected void doCheckPreconditions() throws Exception {
super.doCheckPreconditions();
+ if (!getErrorMessages().isEmpty()) {
+ return;
+ }
if (!getSourceDocument().getArea().equals(Publication.AUTHORING_AREA)) {
addErrorMessage("This usecase can only be invoked in the authoring area!");
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateLanguage.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateLanguage.java?view=diff&r1=155094&r2=155095
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateLanguage.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateLanguage.java Wed Feb 23 14:38:47 2005
@@ -46,10 +46,16 @@
*/
protected void doCheckPreconditions() throws Exception {
super.doCheckPreconditions();
+
+ if (getSourceDocument() == null) {
+ addErrorMessage("This operation must be invoked on a document.");
+ return;
+ }
String area = getSourceDocument().getArea();
if (!area.equals(Publication.AUTHORING_AREA)) {
addErrorMessage("This operation is only supported in the authoring area.");
+ return;
}
if (getNonExistingLanguages().isEmpty()) {
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/DeleteLanguage.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/DeleteLanguage.java?view=diff&r1=155094&r2=155095
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/DeleteLanguage.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/DeleteLanguage.java Wed Feb 23 14:38:47 2005
@@ -34,6 +34,9 @@
*/
protected void doCheckPreconditions() throws Exception {
super.doCheckPreconditions();
+ if (!getErrorMessages().isEmpty()) {
+ return;
+ }
if (!getSourceDocument().getArea().equals(Publication.AUTHORING_AREA)) {
addErrorMessage("This usecase can only be invoked in the authoring area!");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org