summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2006-04-06 04:18:34 (EDT)
committerpelder2006-04-06 04:18:34 (EDT)
commit1fdf86bbd85ddb6f3d41b2b91ad0a0c4effbd8f3 (patch)
tree855707567425c6568e989dd1093a0ccce6d8e690
parentbc38c517915485c0098f34d211e8466967ffac2d (diff)
downloadorg.eclipse.jet-1fdf86bbd85ddb6f3d41b2b91ad0a0c4effbd8f3.zip
org.eclipse.jet-1fdf86bbd85ddb6f3d41b2b91ad0a0c4effbd8f3.tar.gz
org.eclipse.jet-1fdf86bbd85ddb6f3d41b2b91ad0a0c4effbd8f3.tar.bz2
[135218] Add namespace information to XPath function meta data.
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/extensionpoints/XPathFunctionsManager.java3
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/BooleanFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/CeilingFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/ConcatFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/ContainsFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/CountFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/FloorFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/LastFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/LocalNameFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NameFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NamespaceUriFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NormalizeSpaceFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NotFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NumberFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/PositionFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/RoundFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/StartsWithFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/StringFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/StringLengthFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/SubstringAfterFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/SubstringBeforeFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/SubstringFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/SumFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/TranslateFunction.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/TrueFalseFunction.java4
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/xpath/XPathFunctionMetaData.java15
26 files changed, 41 insertions, 27 deletions
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/extensionpoints/XPathFunctionsManager.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/extensionpoints/XPathFunctionsManager.java
index 5d93eea..f7f3741 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/extensionpoints/XPathFunctionsManager.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/extensionpoints/XPathFunctionsManager.java
@@ -104,7 +104,8 @@ public final class XPathFunctionsManager implements IRegistryChangeListener
minArgs = Integer.parseInt(configElement.getAttribute(A_FUNCTION_MINARGS));
maxArgs = Integer.parseInt(configElement.getAttribute(A_FUNCTION_MAXARGS));
try {
- functionData = new XPathFunctionMetaData(name, impl, minArgs, maxArgs);
+ functionData = new XPathFunctionMetaData(
+ name, configElement.getDeclaringExtension().getNamespace(), impl, minArgs, maxArgs);
}
catch (NullPointerException e)
{
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/BooleanFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/BooleanFunction.java
index 32b3bd4..1616ae5 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/BooleanFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/BooleanFunction.java
@@ -31,7 +31,7 @@ import org.eclipse.jet.xpath.XPathFunctionMetaData;
public class BooleanFunction implements XPathFunction
{
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("boolean", new BooleanFunction(), 1, 1); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("boolean", null, new BooleanFunction(), 1, 1); //$NON-NLS-1$
/**
*
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/CeilingFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/CeilingFunction.java
index 71dc2ec..e82a518 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/CeilingFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/CeilingFunction.java
@@ -32,7 +32,7 @@ import org.eclipse.jet.xpath.XPathFunctionMetaData;
public class CeilingFunction implements XPathFunction
{
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("ceiling", new CeilingFunction(), 1, 1); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("ceiling", null, new CeilingFunction(), 1, 1); //$NON-NLS-1$
/**
*
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/ConcatFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/ConcatFunction.java
index 9d59a94..de0047b 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/ConcatFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/ConcatFunction.java
@@ -33,7 +33,7 @@ import org.eclipse.jet.xpath.XPathFunctionMetaData;
public class ConcatFunction implements XPathFunction
{
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("concat", new ConcatFunction(), 2, -1); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("concat", null, new ConcatFunction(), 2, -1); //$NON-NLS-1$
/**
*
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/ContainsFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/ContainsFunction.java
index de07178..44fee1d 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/ContainsFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/ContainsFunction.java
@@ -32,7 +32,7 @@ import org.eclipse.jet.xpath.XPathFunctionMetaData;
public class ContainsFunction implements XPathFunction
{
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("contains", new ContainsFunction(), 2, 2); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("contains", null, new ContainsFunction(), 2, 2); //$NON-NLS-1$
/**
*
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/CountFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/CountFunction.java
index 70cd287..f58567e 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/CountFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/CountFunction.java
@@ -36,7 +36,7 @@ import org.eclipse.jet.xpath.XPathRuntimeException;
public class CountFunction implements XPathFunction
{
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("count", new CountFunction(), 1, 1); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("count", null, new CountFunction(), 1, 1); //$NON-NLS-1$
/**
*
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/FloorFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/FloorFunction.java
index a019a58..af8208b 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/FloorFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/FloorFunction.java
@@ -32,7 +32,7 @@ import org.eclipse.jet.xpath.XPathFunctionMetaData;
public class FloorFunction implements XPathFunction
{
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("floor", new FloorFunction(), 1, 1); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("floor", null, new FloorFunction(), 1, 1); //$NON-NLS-1$
/**
*
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/LastFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/LastFunction.java
index cb299b3..67ffb42 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/LastFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/LastFunction.java
@@ -33,7 +33,7 @@ import org.eclipse.jet.xpath.XPathFunctionWithContext;
public class LastFunction implements XPathFunction, XPathFunctionWithContext
{
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("last", new LastFunction(), 0, 0); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("last", null, new LastFunction(), 0, 0); //$NON-NLS-1$
private Context context;
/**
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/LocalNameFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/LocalNameFunction.java
index d93ed16..eb8bce6 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/LocalNameFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/LocalNameFunction.java
@@ -38,7 +38,7 @@ import org.eclipse.jet.xpath.inspector.InspectorManager;
public class LocalNameFunction implements XPathFunction, XPathFunctionWithContext
{
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("local-name", new LocalNameFunction(), 0, 1); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("local-name", null, new LocalNameFunction(), 0, 1); //$NON-NLS-1$
private Context context;
/**
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NameFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NameFunction.java
index 6b854da..ff0cc3c 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NameFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NameFunction.java
@@ -39,7 +39,7 @@ import org.eclipse.jet.xpath.inspector.InspectorManager;
public class NameFunction implements XPathFunction, XPathFunctionWithContext
{
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("name", new NameFunction(), 0, 1); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("name", null, new NameFunction(), 0, 1); //$NON-NLS-1$
private Context context;
/**
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NamespaceUriFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NamespaceUriFunction.java
index 3def283..988c343 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NamespaceUriFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NamespaceUriFunction.java
@@ -40,7 +40,7 @@ import org.eclipse.jet.xpath.inspector.InspectorManager;
public class NamespaceUriFunction implements XPathFunction, XPathFunctionWithContext
{
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("namespace-uri", new NamespaceUriFunction(), 0, 1); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("namespace-uri", null, new NamespaceUriFunction(), 0, 1); //$NON-NLS-1$
private Context context;
/**
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NormalizeSpaceFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NormalizeSpaceFunction.java
index c51db31..ee73854 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NormalizeSpaceFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NormalizeSpaceFunction.java
@@ -30,7 +30,7 @@ import org.eclipse.jet.xpath.XPathUtil;
public class NormalizeSpaceFunction implements XPathFunction, XPathFunctionWithContext
{
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("normalize-space", new NormalizeSpaceFunction(), 0, 1); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("normalize-space", null, new NormalizeSpaceFunction(), 0, 1); //$NON-NLS-1$
private Context context;
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NotFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NotFunction.java
index a8b49d1..3030ea7 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NotFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NotFunction.java
@@ -32,7 +32,7 @@ import org.eclipse.jet.xpath.XPathFunctionMetaData;
public class NotFunction implements XPathFunction
{
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("not", new NotFunction(), 1, 1); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("not", null, new NotFunction(), 1, 1); //$NON-NLS-1$
/**
*
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NumberFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NumberFunction.java
index 535474c..5ef858b 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NumberFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/NumberFunction.java
@@ -30,7 +30,7 @@ import org.eclipse.jet.xpath.XPathFunctionMetaData;
public class NumberFunction implements XPathFunction
{
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("number", new NumberFunction(), 1, 1); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("number", null, new NumberFunction(), 1, 1); //$NON-NLS-1$
/**
*
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/PositionFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/PositionFunction.java
index edccbef..19bbd82 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/PositionFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/PositionFunction.java
@@ -34,7 +34,7 @@ import org.eclipse.jet.xpath.XPathFunctionWithContext;
public class PositionFunction implements XPathFunction, XPathFunctionWithContext
{
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("position", new PositionFunction(), 0, 0); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("position", null, new PositionFunction(), 0, 0); //$NON-NLS-1$
private Context context;
/**
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/RoundFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/RoundFunction.java
index f68221f..58efb7a 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/RoundFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/RoundFunction.java
@@ -32,7 +32,7 @@ import org.eclipse.jet.xpath.XPathFunctionMetaData;
public class RoundFunction implements XPathFunction
{
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("round", new RoundFunction(), 1, 1); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("round", null, new RoundFunction(), 1, 1); //$NON-NLS-1$
/**
*
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/StartsWithFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/StartsWithFunction.java
index e61e200..50c97c9 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/StartsWithFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/StartsWithFunction.java
@@ -32,7 +32,7 @@ import org.eclipse.jet.xpath.XPathFunctionMetaData;
public class StartsWithFunction implements XPathFunction
{
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("starts-with", new StartsWithFunction(), 2, 2); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("starts-with", null, new StartsWithFunction(), 2, 2); //$NON-NLS-1$
/**
*
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/StringFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/StringFunction.java
index a418452..d48e89b 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/StringFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/StringFunction.java
@@ -37,7 +37,7 @@ import org.eclipse.jet.xpath.inspector.InspectorManager;
public class StringFunction implements XPathFunction, XPathFunctionWithContext
{
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("string", new StringFunction(), 1, 1); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("string", null, new StringFunction(), 1, 1); //$NON-NLS-1$
private Context context;
/**
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/StringLengthFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/StringLengthFunction.java
index 09ca7bc..ab6740c 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/StringLengthFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/StringLengthFunction.java
@@ -34,7 +34,7 @@ import org.eclipse.jet.xpath.XPathFunctionWithContext;
public class StringLengthFunction implements XPathFunction, XPathFunctionWithContext
{
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("string-length", new StringLengthFunction(), 0, 1); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("string-length", null, new StringLengthFunction(), 0, 1); //$NON-NLS-1$
private Context context;
/**
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/SubstringAfterFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/SubstringAfterFunction.java
index 5cca53a..a7bec09 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/SubstringAfterFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/SubstringAfterFunction.java
@@ -32,7 +32,7 @@ import org.eclipse.jet.xpath.XPathFunctionMetaData;
public class SubstringAfterFunction implements XPathFunction
{
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("substring-after", new SubstringAfterFunction(), 2, 2); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("substring-after", null, new SubstringAfterFunction(), 2, 2); //$NON-NLS-1$
/**
*
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/SubstringBeforeFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/SubstringBeforeFunction.java
index e3d5574..fc04cc1 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/SubstringBeforeFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/SubstringBeforeFunction.java
@@ -32,7 +32,7 @@ import org.eclipse.jet.xpath.XPathFunctionMetaData;
public class SubstringBeforeFunction implements XPathFunction
{
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("substring-before", new SubstringBeforeFunction(), 2, 2); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("substring-before", null, new SubstringBeforeFunction(), 2, 2); //$NON-NLS-1$
/**
*
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/SubstringFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/SubstringFunction.java
index 3473421..b683c1f 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/SubstringFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/SubstringFunction.java
@@ -33,7 +33,7 @@ public class SubstringFunction implements XPathFunction
{
private static final String EMPTY_STRING = ""; //$NON-NLS-1$
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("substring", new SubstringFunction(), 2, 3); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("substring", null, new SubstringFunction(), 2, 3); //$NON-NLS-1$
/**
*
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/SumFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/SumFunction.java
index fc13752..0e9cf39 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/SumFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/SumFunction.java
@@ -37,7 +37,7 @@ import org.eclipse.jet.xpath.XPathRuntimeException;
public class SumFunction implements XPathFunction
{
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("sum", new SumFunction(), 1, 1); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("sum", null, new SumFunction(), 1, 1); //$NON-NLS-1$
/**
*
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/TranslateFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/TranslateFunction.java
index 6034fff..c2c4a50 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/TranslateFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/TranslateFunction.java
@@ -28,7 +28,7 @@ import org.eclipse.jet.xpath.XPathUtil;
public class TranslateFunction implements XPathFunction
{
- public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("translate", new TranslateFunction(), 3, 3); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FUNCTION_META_DATA = new XPathFunctionMetaData("translate", null, new TranslateFunction(), 3, 3); //$NON-NLS-1$
/* (non-Javadoc)
* @see org.eclipse.jet.xpath.XPathFunction#evaluate(java.util.List)
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/TrueFalseFunction.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/TrueFalseFunction.java
index 0cabbcb..6386857 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/TrueFalseFunction.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/xpath/functions/TrueFalseFunction.java
@@ -34,8 +34,8 @@ import org.eclipse.jet.xpath.XPathFunctionMetaData;
public class TrueFalseFunction implements XPathFunction
{
- public static final XPathFunctionMetaData TRUE_FUNCTION_META_DATA = new XPathFunctionMetaData("true", new TrueFalseFunction(true), 0, 0); //$NON-NLS-1$
- public static final XPathFunctionMetaData FALSE_FUNCTION_META_DATA = new XPathFunctionMetaData("false", new TrueFalseFunction(false), 0, 0); //$NON-NLS-1$
+ public static final XPathFunctionMetaData TRUE_FUNCTION_META_DATA = new XPathFunctionMetaData("true", null, new TrueFalseFunction(true), 0, 0); //$NON-NLS-1$
+ public static final XPathFunctionMetaData FALSE_FUNCTION_META_DATA = new XPathFunctionMetaData("false", null, new TrueFalseFunction(false), 0, 0); //$NON-NLS-1$
private final Boolean functionReturnValue;
public TrueFalseFunction(boolean functionReturnValue)
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/xpath/XPathFunctionMetaData.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/xpath/XPathFunctionMetaData.java
index 6f5c47e..8a895fc 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/xpath/XPathFunctionMetaData.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/xpath/XPathFunctionMetaData.java
@@ -31,16 +31,28 @@ public final class XPathFunctionMetaData
private final String name;
+ private final String namespace;
+
+ /**
+ * Return the namespace of the function.
+ * @return Returns the namespace.
+ */
+ public final String getNamespace()
+ {
+ return namespace;
+ }
+
/**
* Create function metadata.
* @param name the name of the function, as it occurs in XPath expressions.
+ * @param namespace the namespace of the functions.
* @param function the function implementation
* @param minArgs the minimum number of arguments. Must be non-negative.
* @param maxArgs the maximum number of arguments. Must be non-negative or -1 indicating an unlimited number of arguments.
* @throws NullPointerException if name or function name are <code>null</code>.
* @throws IllegalArgumentException if minArgs or maxArgs do not conform to their expected values.
*/
- public XPathFunctionMetaData(String name, XPathFunction function, int minArgs, int maxArgs)
+ public XPathFunctionMetaData(String name, String namespace, XPathFunction function, int minArgs, int maxArgs)
{
if(name == null) {
throw new NullPointerException("name"); //$NON-NLS-1$
@@ -59,6 +71,7 @@ public final class XPathFunctionMetaData
}
this.name = name;
+ this.namespace = namespace;
this.function = function;
this.minArgs = minArgs;
this.maxArgs = maxArgs;