X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2Ftasks%2FOverrideContextAware.java;h=4fc313f11e4d4fd9212e8a5a257f856ec0358e11;hb=5fcacdb600e4c9e765cb93b46132932662832c1b;hp=bb095684dff0c854f97bba50c677b3080ed5d89c;hpb=ee6c3543a0ff9403420ce6a9c647723269f14331;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/tasks/OverrideContextAware.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/tasks/OverrideContextAware.java
index bb095684d..4fc313f11 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/tasks/OverrideContextAware.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/tasks/OverrideContextAware.java
@@ -1,31 +1,49 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.slc.core.execution.tasks;
 
 import org.argeo.slc.SlcException;
 import org.argeo.slc.core.test.context.SimpleContextAware;
 import org.argeo.slc.test.context.ContextAware;
 
+/**
+ * Overrides Values and Expected values of a target 
+ * <code>SimpleContextAware</code> with the corresponding
+ * values and expected values of a source <code>ContextAware</code>
+ *
+ */
 public class OverrideContextAware implements Runnable {
 
 	private ContextAware source;
 
 	private SimpleContextAware target;
 	
-
-	public void setSource(ContextAware source) {
-		this.source = source;
-	}
-
-
-	public void setTarget(SimpleContextAware target) {
-		this.target = target;
-	}
-
-
+	/**
+	 * Whether an exception shall be thrown if a value
+	 * or expected value of the source is not defined
+	 * in the target
+	 */
+	private Boolean failIfUndefinedInSource = true;
+	
 	public void run() {
 		// override values
 		if(source.getValues() != null)
 			for(String key : source.getValues().keySet()) {
-				if(!target.getValues().containsKey(key)) {
+				if(failIfUndefinedInSource && !target.getValues().containsKey(key)) {
 					throw new SlcException("No entry in target values for key '" + key + "'");
 				}
 				target.getValues().put(key, source.getValues().get(key));
@@ -34,10 +52,22 @@ public class OverrideContextAware implements Runnable {
 		// override expected values
 		if(source.getExpectedValues() != null)
 			for(String key : source.getExpectedValues().keySet()) {
-				if(!target.getExpectedValues().containsKey(key)) {
+				if(failIfUndefinedInSource && !target.getExpectedValues().containsKey(key)) {
 					throw new SlcException("No entry in target expected values for key '" + key + "'");
 				}
 				target.getExpectedValues().put(key, source.getExpectedValues().get(key));
 			}		
 	}	
+	
+	public void setSource(ContextAware source) {
+		this.source = source;
+	}
+
+	public void setTarget(SimpleContextAware target) {
+		this.target = target;
+	}
+
+	public void setFailIfUndefinedInSource(Boolean failIfUndefinedInSource) {
+		this.failIfUndefinedInSource = failIfUndefinedInSource;
+	}	
 }