You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2016/08/22 21:21:25 UTC
svn commit: r1757279 - in
/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima:
resource/ResourceManager.java util/XmlCasDeserializer.java
Author: schor
Date: Mon Aug 22 21:21:25 2016
New Revision: 1757279
URL: http://svn.apache.org/viewvc?rev=1757279&view=rev
Log:
[UIMA-5066] remove internal method that was added, from ResourceManager API. Remove unused internal use method deserializeR from XmiCasDeserializer; change 2nd deserializeR method from public to default - it's not part of the public API.
Modified:
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XmlCasDeserializer.java
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java?rev=1757279&r1=1757278&r2=1757279&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java Mon Aug 22 21:21:25 2016
@@ -313,11 +313,4 @@ public interface ResourceManager {
* @return A map from absolute URL to the XMLizable object that was parsed from that URL
*/
public Map<String,XMLizable> getImportCache();
-
- /**
- * Gets a cache of imported descriptor URLs from which the parsed objects in the above map
- * were created, so that these URLs are not re-parsed if the same URL is imported again.
- * @return A map from absolute URL to a set of URLs it imports.
- */
- public Map<String,Set<String>> getImportUrlsCache();
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XmlCasDeserializer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XmlCasDeserializer.java?rev=1757279&r1=1757278&r2=1757279&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XmlCasDeserializer.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XmlCasDeserializer.java Mon Aug 22 21:21:25 2016
@@ -60,25 +60,6 @@ public abstract class XmlCasDeserializer
}
/**
- * Different named version that returns the SerialFormat
- * Deserializes a CAS from a standoff-XML format.
- *
- * @param aStream
- * input stream from which to read the XML document
- * @param aCAS
- * CAS into which to deserialize. This CAS must be set up with a type system that is
- * compatible with that in the XML.
- * @return the format of the data
- * @throws SAXException
- * if an XML Parsing error occurs
- * @throws IOException
- * if an I/O failure occurs
- */
- public static SerialFormat deserializeR(InputStream aStream, CAS aCAS) throws SAXException, IOException {
- return deserializeR(aStream, aCAS, false);
- }
-
- /**
* Deserializes a CAS from XMI or XCAS.
*
* @param aStream
@@ -121,7 +102,7 @@ public abstract class XmlCasDeserializer
* @throws IOException
* if an I/O failure occurs
*/
- public static SerialFormat deserializeR(InputStream aStream, CAS aCAS, boolean aLenient)
+ static SerialFormat deserializeR(InputStream aStream, CAS aCAS, boolean aLenient)
throws SAXException, IOException {
XMLReader xmlReader = XMLReaderFactory.createXMLReader();
XmlCasDeserializerHandler handler = new XmlCasDeserializerHandler(aCAS, aLenient);