X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Ftest%2Fcontext%2FSimpleContextAware.java;h=c4fb5ab40aae9950525ec7e791b88e3be7c482cf;hb=1a4b784250a43f6c7421ab5d8567c3bfbf51e990;hp=9ce69cdee1e83ae5121a44fad632aca377e962b5;hpb=7717aa5e3983a7f91e071671a2ef0b8a904e5913;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/SimpleContextAware.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/SimpleContextAware.java
index 9ce69cdee..c4fb5ab40 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/SimpleContextAware.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/SimpleContextAware.java
@@ -1,17 +1,21 @@
 package org.argeo.slc.core.test.context;
 
-import java.beans.BeanInfo;
 import java.util.Map;
 import java.util.TreeMap;
 
 import org.springframework.beans.factory.InitializingBean;
 
+import org.argeo.slc.core.SlcException;
+
 public class SimpleContextAware implements ContextAware, InitializingBean {
-	private SimpleParentContextAware parentContext;
+	private ParentContextAware parentContext;
 
 	private Map<String, Object> values = new TreeMap<String, Object>();
 	private Map<String, Object> expectedValues = new TreeMap<String, Object>();
 
+	private String contextSkipFlag = DEFAULT_SKIP_FLAG;
+	private String contextAnyFlag = DEFAULT_ANY_FLAG;
+
 	public Map<String, Object> getValues() {
 		return values;
 	}
@@ -29,12 +33,14 @@ public class SimpleContextAware implements ContextAware, InitializingBean {
 	}
 
 	/** Used to add this context as a child by setting a property. */
-	public void setParentContext(SimpleParentContextAware parentContextAware) {
-		parentContextAware.addChildContext(this);
+	public void setParentContext(ParentContextAware parentContextAware) {
+		if (parentContext != null)
+			throw new SlcException("Parent context already set");
 		this.parentContext = parentContextAware;
+		this.parentContext.addChildContext(this);
 	}
 
-	protected SimpleParentContextAware getParentContext() {
+	protected ParentContextAware getParentContext() {
 		return parentContext;
 	}
 
@@ -44,4 +50,20 @@ public class SimpleContextAware implements ContextAware, InitializingBean {
 		}
 	}
 
+	public String getContextSkipFlag() {
+		return contextSkipFlag;
+	}
+
+	public void setContextSkipFlag(String contextSkipFlag) {
+		this.contextSkipFlag = contextSkipFlag;
+	}
+
+	public String getContextAnyFlag() {
+		return contextAnyFlag;
+	}
+
+	public void setContextAnyFlag(String contextAnyFlag) {
+		this.contextAnyFlag = contextAnyFlag;
+	}
+
 }