svn commit: r1504987 - in /uima/uimaj/trunk/uimaj-core/src: main/java/org/apache/uima/UimaContext.java main/java/org/apache/uima/impl/UimaContext_ImplBase.java test/java/org/apache/uima/analysis_engine/impl/TestAnnotator2.java

[bu...@apache.org]

Author: burn
Date: Fri Jul 19 20:07:51 2013
New Revision: 1504987

URL: http://svn.apache.org/r1504987
Log:
UIMA-3090 - Remove getExternalParameterValue method from UimaContext

Modified:
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContext.java
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java
    uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator2.java

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContext.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContext.java?rev=1504987&r1=1504986&r2=1504987&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContext.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContext.java Fri Jul 19 20:07:51 2013
@@ -116,21 +116,6 @@ public interface UimaContext {
   public String[] getConfigParameterNames();
 
   /**
-   * Retrieves the value for an external parameter defined in the External Override Settings
-   * as specified in the top-level descriptor's operationalProperties section, or via the
-   *  -DUimaExternalOverrides value.
-   * 
-   * @param aParamName
-   *          the name of the parameter to look up
-   * 
-   * @return the value of the parameter with the given name, as a String.
-   *         Returns <code>null</code> if the parameter does not exist.
-   *         Returns an empty string (<code>""</code>) if the parameter was not assigned a value.
-   * @throws ResourceConfigurationException if the parameter refers to an undefined variable
-   */
-  public String getExternalParameterValue(String aParamName) throws ResourceConfigurationException;
-  
-  /**
    * Gets the <code>Logger</code> to which log output will be sent. UIMA components should use
    * this facility rather than writing to their own log files (or to stdout).
    * 

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java?rev=1504987&r1=1504986&r2=1504987&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java Fri Jul 19 20:07:51 2013
@@ -479,15 +479,6 @@ public abstract class UimaContext_ImplBa
   }
 
   /**
-   * Lookup and evaluate an arbitrary (string) parameter from the External Override Settings
-   * Lets annotator configuration bypass the descriptor parameters. 
-   * @throws ResourceConfigurationException 
-   */
-  public String getExternalParameterValue(String name) throws ResourceConfigurationException {
-    return mExternalOverrides == null ? null : mExternalOverrides.lookUp(name);
-  }
-
-  /**
    * (non-Javadoc)
    * 
    * @see org.apache.uima.UimaContextAdmin#getExternalOverrides()

Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator2.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator2.java?rev=1504987&r1=1504986&r2=1504987&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator2.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator2.java Fri Jul 19 20:07:51 2013
@@ -69,7 +69,8 @@ public class TestAnnotator2 extends CasA
     if ("/ExternalOverrides/".equals(contextName)) {
       String actual = null;
       try {
-        actual = aContext.getExternalParameterValue("test.externalFloatArray");
+        Settings settings = ((UimaContext_ImplBase)aContext).getExternalOverrides();
+        actual = settings.lookUp("test.externalFloatArray");
       } catch (ResourceConfigurationException e) {
         Assert.fail(e.getMessage());
       }