# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1409839630 -7200
# Node ID e2c691eedf4d62d6df4cb8e74daa754e287a8c04
# Parent  89acb486bb5241afa1b23e9c0b8c8efd8d2187af
push action data and action properties to action context

diff -r 89acb486bb52 -r e2c691eedf4d java/alt2xml-cli/src/cz/frantovo/alt2xml/cli/CLIOptions.java
--- a/java/alt2xml-cli/src/cz/frantovo/alt2xml/cli/CLIOptions.java	Thu Sep 04 00:39:11 2014 +0200
+++ b/java/alt2xml-cli/src/cz/frantovo/alt2xml/cli/CLIOptions.java	Thu Sep 04 16:07:10 2014 +0200
@@ -46,7 +46,7 @@
 
 	public void validate() throws InvalidOptionsException {
 		InvalidOptionsException e = new InvalidOptionsException();
-		
+
 		if (inputFile == null && systemId == null) {
 			e.addProblem(new InvalidOptionsException.OptionProblem("Please specify also systemId when reading from a stream (like STDIN) instead of from a file."));
 		}
@@ -109,12 +109,23 @@
 		readerProperties.put(name, value);
 	}
 
+	public Properties getReaderProperties() {
+		return readerProperties;
+	}
+
 	public void addActionProperty(String name, String value) {
 		actionProperties.put(name, value);
 	}
 
+	public Properties getActionProperties() {
+		return actionProperties;
+	}
+
 	public void addActionData(String value) {
 		actionData.add(value);
 	}
 
+	public List<String> getActionData() {
+		return actionData;
+	}
 }
diff -r 89acb486bb52 -r e2c691eedf4d java/alt2xml-cli/src/cz/frantovo/alt2xml/cli/CLIStarter.java
--- a/java/alt2xml-cli/src/cz/frantovo/alt2xml/cli/CLIStarter.java	Thu Sep 04 00:39:11 2014 +0200
+++ b/java/alt2xml-cli/src/cz/frantovo/alt2xml/cli/CLIStarter.java	Thu Sep 04 16:07:10 2014 +0200
@@ -79,6 +79,10 @@
 			} else {
 
 				ActionContext actionContext = new ActionContext(cliOptions.getOutputStream());
+				
+				actionContext.setActionProperties(cliOptions.getActionProperties());
+				actionContext.setActionData(cliOptions.getActionData());
+				
 				Action action = actionFactory.getAction(actionContext);
 
 				SAXParserFactory t = SAXParserFactory.newInstance();
diff -r 89acb486bb52 -r e2c691eedf4d java/alt2xml-lib-output/src/cz/frantovo/alt2xml/out/ActionContext.java
--- a/java/alt2xml-lib-output/src/cz/frantovo/alt2xml/out/ActionContext.java	Thu Sep 04 00:39:11 2014 +0200
+++ b/java/alt2xml-lib-output/src/cz/frantovo/alt2xml/out/ActionContext.java	Thu Sep 04 16:07:10 2014 +0200
@@ -18,6 +18,8 @@
 package cz.frantovo.alt2xml.out;
 
 import java.io.OutputStream;
+import java.util.List;
+import java.util.Properties;
 
 /**
  * Context for one action instance.
@@ -26,7 +28,9 @@
  */
 public class ActionContext {
 
-	private OutputStream outputStream;
+	private final OutputStream outputStream;
+	private Properties actionProperties;
+	private List<String> actionData;
 
 	public ActionContext(OutputStream outputStream) {
 		this.outputStream = outputStream;
@@ -36,4 +40,20 @@
 		return outputStream;
 	}
 
+	public Properties getActionProperties() {
+		return actionProperties;
+	}
+
+	public void setActionProperties(Properties actionProperties) {
+		this.actionProperties = actionProperties;
+	}
+
+	public List<String> getActionData() {
+		return actionData;
+	}
+
+	public void setActionData(List<String> actionData) {
+		this.actionData = actionData;
+	}
+
 }
diff -r 89acb486bb52 -r e2c691eedf4d java/alt2xml-out-xpath/src/cz/frantovo/alt2xml/out/xpath/XPathAction.java
--- a/java/alt2xml-out-xpath/src/cz/frantovo/alt2xml/out/xpath/XPathAction.java	Thu Sep 04 00:39:11 2014 +0200
+++ b/java/alt2xml-out-xpath/src/cz/frantovo/alt2xml/out/xpath/XPathAction.java	Thu Sep 04 16:07:10 2014 +0200
@@ -26,7 +26,6 @@
 import javax.xml.xpath.XPathExpression;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
-import org.w3c.dom.Node;
 
 /**
  *