Some more cleanups

Author: laeubi

bundles/org.eclipse.e4.emf.xpath/src/org/apache/commons/jxpath/BasicNodeSet.java

@@ -50,16 +50,6 @@ public void add(final NodeSet nodeSet) {
         }
     }
 
-    /**
-     * Remove a pointer from this NodeSet.
-     * @param pointer to remove
-     */
-    public void remove(final Pointer pointer) {
-        if (pointers.remove(pointer)) {
-            clearCacheLists();
-        }
-    }
-
     @Override
     public synchronized List getPointers() {
         if (readOnlyPointers == null) {

bundles/org.eclipse.e4.emf.xpath/src/org/apache/commons/jxpath/JXPathContext.java

@@ -17,10 +17,8 @@
 package org.apache.commons.jxpath;
 
 import java.text.DecimalFormatSymbols;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Locale;
 
 import org.apache.commons.jxpath.util.KeyManagerUtils;
@@ -597,23 +595,6 @@ public synchronized Locale getLocale() {
         return locale;
     }
 
-    /**
-     * Sets {@link DecimalFormatSymbols} for a given name. The DecimalFormatSymbols
-     * can be referenced as the third, optional argument in the invocation of
-     * {@code format-number (number,format,decimal-format-name)} function.
-     * By default, JXPath uses the symbols for the current locale.
-     *
-     * @param name the format name or null for default format.
-     * @param symbols DecimalFormatSymbols
-     */
-    public synchronized void setDecimalFormatSymbols(final String name,
-            final DecimalFormatSymbols symbols) {
-        if (decimalFormats == null) {
-            decimalFormats = new HashMap<>();
-        }
-        decimalFormats.put(name, symbols);
-    }
-
     /**
      * Gets the named DecimalFormatSymbols.
      * @param name key
@@ -654,22 +635,6 @@ public synchronized boolean isLenient() {
         return lenient;
     }
 
-    /**
-     * Compiles the supplied XPath and returns an internal representation
-     * of the path that can then be evaluated.  Use CompiledExpressions
-     * when you need to evaluate the same expression multiple times
-     * and there is a convenient place to cache CompiledExpression
-     * between invocations.
-     * @param xpath to compile
-     * @return CompiledExpression
-     */
-    public static CompiledExpression compile(final String xpath) {
-        if (compilationContext == null) {
-            compilationContext = newContext(null);
-        }
-        return compilationContext.compilePath(xpath);
-    }
-
     /**
      * Overridden by each concrete implementation of JXPathContext
      * to perform compilation. Is called by {@code compile()}.
@@ -678,37 +643,6 @@ public static CompiledExpression compile(final String xpath) {
      */
     protected abstract CompiledExpression compilePath(String xpath);
 
-    /**
-     * Finds the first object that matches the specified XPath. It is equivalent
-     * to {@code getPointer(xpath).getNode()}. Note that this method
-     * produces the same result as {@code getValue()} on object models
-     * like JavaBeans, but a different result for DOM/JDOM etc., because it
-     * returns the Node itself, rather than its textual contents.
-     *
-     * @param xpath the xpath to be evaluated
-     * @return the found object
-     */
-    public Object selectSingleNode(final String xpath) {
-        final Pointer pointer = getPointer(xpath);
-        return pointer == null ? null : pointer.getNode();
-    }
-
-    /**
-     * Finds all nodes that match the specified XPath.
-     *
-     * @param xpath the xpath to be evaluated
-     * @return a list of found objects
-     */
-    public List selectNodes(final String xpath) {
-        final ArrayList list = new ArrayList();
-        final Iterator<Pointer> iterator = iteratePointers(xpath);
-        while (iterator.hasNext()) {
-            final Pointer pointer = iterator.next();
-            list.add(pointer.getNode());
-        }
-        return list;
-    }
-
     /**
      * Evaluates the xpath and returns the resulting object. Primitive
      * types are wrapped into objects.
@@ -879,22 +813,6 @@ public KeyManager getKeyManager() {
         return keyManager;
     }
 
-    /**
-     * Locates a Node by a key value.
-     * @param key string
-     * @param value string
-     * @return Pointer found
-     */
-    public Pointer getPointerByKey(final String key, final String value) {
-        final KeyManager manager = getKeyManager();
-        if (manager != null) {
-            return manager.getPointerByKey(this, key, value);
-        }
-        throw new JXPathException(
-            "Cannot find an element by key - "
-                + "no KeyManager has been specified");
-    }
-
     /**
      * Locates a NodeSet by key/value.
      * @param key string

bundles/org.eclipse.e4.emf.xpath/src/org/apache/commons/jxpath/JXPathContextFactoryConfigurationError.java

@@ -36,17 +36,6 @@ public JXPathContextFactoryConfigurationError() {
          this.exception = null;
      }
 
-    /**
-     * Create a new {@code JXPathContextFactoryConfigurationError} with
-     * the {@code String } specified as an error message.
-     *
-     * @param msg The error message for the exception.
-     */
-    public JXPathContextFactoryConfigurationError(final String msg) {
-        super(msg);
-        this.exception = null;
-    }
-
     /**
      * Create a new {@code JXPathContextFactoryConfigurationError} with a
      * given {@code Exception} base cause of the error.
@@ -59,19 +48,6 @@ public JXPathContextFactoryConfigurationError(final Exception e) {
         this.exception = e;
     }
 
-    /**
-     * Create a new {@code JXPathContextFactoryConfigurationError} with the
-     * given {@code Exception} base cause and detail message.
-     *
-     * @param e The exception to be encapsulated in a
-     * JXPathContextFactoryConfigurationError
-     * @param msg The detail message.
-     */
-    public JXPathContextFactoryConfigurationError(final Exception e, final String msg) {
-        super(msg);
-        this.exception = e;
-    }
-
     /**
      * Gets the message (if any) for this error . If there is no
      * message for the exception and there is an encapsulated

bundles/org.eclipse.e4.emf.xpath/src/org/apache/commons/jxpath/JXPathException.java

@@ -46,18 +46,6 @@ public JXPathException(final String msg) {
         this.exception = null;
     }
 
-    /**
-     * Create a new {@code JXPathException} with a
-     * given {@code Throwable} base cause of the error.
-     *
-     * @param e The exception to be encapsulated in a
-     * JXPathException.
-     */
-    public JXPathException(final Throwable e) {
-        super(e.toString());
-        this.exception = e;
-    }
-
     /**
      * Create a new {@code JXPathException} with the
      * given {@code Exception} base cause and detail message.

bundles/org.eclipse.e4.emf.xpath/src/org/apache/commons/jxpath/ri/JXPathCompiledExpression.java

@@ -41,22 +41,6 @@ public JXPathCompiledExpression(final String xpath, final Expression expression)
         this.expression = expression;
     }
 
-    /**
-     * Gets the source expression.
-     * @return String
-     */
-    protected String getXPath() {
-        return xpath;
-    }
-
-    /**
-     * Gets the compiled expression.
-     * @return Expression
-     */
-    protected Expression getExpression() {
-        return expression;
-    }
-
     @Override
     public String toString() {
         return xpath;

bundles/org.eclipse.e4.emf.xpath/src/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java

@@ -121,21 +121,6 @@ public static void addNodePointerFactory(final NodePointerFactory factory) {
         }
     }
 
-    /**
-     * Removes support for additional types of objects.
-     *
-     * @param factory NodePointerFactory to remove
-     * @return true if this implementation contained the specified element
-     * @since 1.4.0
-     */
-    public static boolean removeNodePointerFactory(final NodePointerFactory factory) {
-        synchronized (nodeFactories) {
-            final boolean remove = nodeFactories.remove(factory);
-            nodeFactoryArray = null;
-            return remove;
-        }
-    }
-
     /**
      * Gets the registered NodePointerFactories.
      * @return NodePointerFactory[]
@@ -150,16 +135,6 @@ public static NodePointerFactory[] getNodePointerFactories() {
     private Pointer rootPointer;
     private Pointer contextPointer;
 
-    /**
-     * Create a new JXPathContextReferenceImpl.
-     * @param parentContext parent context
-     * @param contextBean Object
-     */
-    protected JXPathContextReferenceImpl(final JXPathContext parentContext,
-            final Object contextBean) {
-        this(parentContext, contextBean, null);
-    }
-
     /**
      * Create a new JXPathContextReferenceImpl.
      * @param parentContext parent context

bundles/org.eclipse.e4.emf.xpath/src/org/apache/commons/jxpath/ri/axes/RootContext.java

@@ -32,7 +32,6 @@ public class RootContext extends EvalContext {
     private final NodePointer pointer;
     private Object[] registers;
     private int availableRegister = 0;
-    public static final Object UNKNOWN_VALUE = new Object();
     private static final int MAX_REGISTER = 4;
 
     /**
@@ -145,37 +144,6 @@ public Function getFunction(final QName functionName, final Object[] parameters)
         return jxpathContext.getFunction(functionName, parameters);
     }
 
-    /**
-     * Gets a registered value.
-     * @param id int
-     * @return Object
-     */
-    public Object getRegisteredValue(final int id) {
-        if (registers == null || id >= MAX_REGISTER || id == -1) {
-            return UNKNOWN_VALUE;
-        }
-        return registers[id];
-    }
-
-    /**
-     * Sets the next registered value.
-     * @param value Object
-     * @return the id that can reclaim value.
-     */
-    public int setRegisteredValue(final Object value) {
-        if (registers == null) {
-            registers = new Object[MAX_REGISTER];
-            for (int i = 0; i < MAX_REGISTER; i++) {
-                registers[i] = UNKNOWN_VALUE;
-            }
-        }
-        if (availableRegister >= MAX_REGISTER) {
-            return -1;
-        }
-        registers[availableRegister] = value;
-        availableRegister++;
-        return availableRegister - 1;
-    }
 
     @Override
     public String toString() {

bundles/org.eclipse.e4.emf.xpath/src/org/apache/commons/jxpath/ri/compiler/Expression.java

@@ -36,15 +36,6 @@
  */
 public abstract class Expression {
 
-    /** Zero */
-    protected static final Double ZERO = Double.valueOf(0);
-
-    /** One */
-    protected static final Double ONE = Double.valueOf(1);
-
-    /** NaN */
-    protected static final Double NOT_A_NUMBER = Double.valueOf(Double.NaN);
-
     private boolean contextDependencyKnown = false;
     private boolean contextDependent;
 

bundles/org.eclipse.e4.emf.xpath/src/org/apache/commons/jxpath/ri/model/NodePointer.java

@@ -24,7 +24,6 @@
 import org.apache.commons.jxpath.JXPathContext;
 import org.apache.commons.jxpath.JXPathException;
 import org.apache.commons.jxpath.JXPathNotFoundException;
-import org.apache.commons.jxpath.NodeSet;
 import org.apache.commons.jxpath.Pointer;
 import org.apache.commons.jxpath.ri.Compiler;
 import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl;
@@ -648,31 +647,6 @@ public Pointer getPointerByID(final JXPathContext context, final String id) {
         return context.getPointerByID(id);
     }
 
-    /**
-     * Locates a node by key and value.
-     * @param context owning JXPathContext
-     * @param key key to search for
-     * @param value value to match
-     * @return Pointer found
-     */
-    public Pointer getPointerByKey(
-            final JXPathContext context,
-            final String key,
-            final String value) {
-        return context.getPointerByKey(key, value);
-    }
-
-    /**
-     * Find a NodeSet by key/value.
-     * @param context owning JXPathContext
-     * @param key key to search for
-     * @param value value to match
-     * @return NodeSet found
-     */
-    public NodeSet getNodeSetByKey(final JXPathContext context, final String key, final Object value) {
-        return context.getNodeSetByKey(key, value);
-    }
-
     /**
      * Returns an XPath that maps to this Pointer.
      * @return String xpath expression
@@ -800,13 +774,6 @@ private int compareNodePointers(
         return r == 0 ? p1.parent.compareChildNodePointers(p1, p2) : r;
     }
 
-    /**
-     * Print internal structure of a pointer for debugging
-     */
-    public void printPointerChain() {
-        printDeep(this, "");
-    }
-
     /**
      * Sets the exceptionHandler of this NodePointer.
      * @param exceptionHandler the ExceptionHandler to set

bundles/org.eclipse.e4.emf.xpath/src/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java

@@ -66,16 +66,6 @@ public class DOMNodePointer extends NodePointer {
     public static final String XMLNS_NAMESPACE_URI =
             "http://www.w3.org/2000/xmlns/";
 
-    /**
-     * Create a new DOMNodePointer.
-     * @param node pointed at
-     * @param locale Locale
-     */
-    public DOMNodePointer(final Node node, final Locale locale) {
-        super(null, locale);
-        this.node = node;
-    }
-
     /**
      * Create a new DOMNodePointer.
      * @param node pointed at