svn commit: r1559645 - in /stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi: ContentItem.java EnhancementEngine.java

[rw...@apache.org]

Author: rwesten
Date: Mon Jan 20 08:49:38 2014
New Revision: 1559645

URL: http://svn.apache.org/r1559645
Log:
this reverts most of the changes committed in r1559644 for ContentItem and EnhancementEngine. The only thing kept are improvements to the Java Doc.

Modified:
    stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/ContentItem.java
    stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/EnhancementEngine.java

Modified: stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/ContentItem.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/ContentItem.java?rev=1559645&r1=1559644&r2=1559645&view=diff
==============================================================================
--- stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/ContentItem.java (original)
+++ stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/ContentItem.java Mon Jan 20 08:49:38 2014
@@ -39,8 +39,6 @@ public interface ContentItem {
      * The binary content stream. Shortcut for
      * <code>{@link #getBlob()}{@link Blob#getStream() .getStream()}</code>
      * @return the InputStream
-     * @deprecated use <code>{@link #getBlob()}{@link Blob#getStream() .getStream()}</code>
-     * instead
      */
     InputStream getStream();
 
@@ -48,8 +46,6 @@ public interface ContentItem {
      * The MimeType. Shortcut for
      * <code>{@link #getBlob()}{@link Blob#getMimeType() .getMimeType()}</code>.
      * @return the MimeType as string
-     * @deprecated use <code>{@link #getBlob()}{@link Blob#getMimeType() .getMimeType()}</code>
-     * instead
      */
     String getMimeType();
 

Modified: stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/EnhancementEngine.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/EnhancementEngine.java?rev=1559645&r1=1559644&r2=1559645&view=diff
==============================================================================
--- stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/EnhancementEngine.java (original)
+++ stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/EnhancementEngine.java Mon Jan 20 08:49:38 2014
@@ -64,13 +64,10 @@ public interface EnhancementEngine {
      * fail (unless this engine is marked as OPTIONAL).
      *
      * @param ci The ContentItem to enhance
-     * @param context The enhancement context: Request specific parameters
-     *
      * @throws EngineException if the introspecting process of the content item
      *             fails
      */
     int canEnhance(ContentItem ci) throws EngineException;
-    //int canEnhance(ContentItem ci, Map<String,Object> context) throws EngineException;
 
     /**
      * Compute enhancements for supplied ContentItem. The results of the process
@@ -87,13 +84,11 @@ public interface EnhancementEngine {
      * an {@link EngineException} need to be thrown.
      *
      * @param ci The ContentItem to enhance
-     * @param context The enhancement context: Request specific parameters
-     *
      * @throws EngineException if the underlying process failed to work as
      *             expected
      */
     void computeEnhancements(ContentItem ci) throws EngineException;
-    //void computeEnhancements(ContentItem ci, Map<String,Object> context) throws EngineException;
+
     /**
      * Getter for the name of this EnhancementEngine instance as configured
      * by {@link #PROPERTY_NAME}