Author: schor
Date: Wed May 25 14:41:13 2016
New Revision: 1745497
URL: http://svn.apache.org/viewvc?rev=1745497&view=rev
Log:
[UIMA-4674] remove / comment out debug code, avoid some findbugs warnings, make
some more fields final
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_iicp.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/MarkerImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/XmlAttribute.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/XmlElementNameAndContents.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTst.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java?rev=1745497&r1=1745496&r2=1745497&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java
Wed May 25 14:41:13 2016
@@ -175,9 +175,7 @@ class FeaturePathImpl implements Feature
if ((index = token.indexOf(BUILT_IN_FUNCTION_SEPARATOR)) != -1) {
if (index > 0) {
// we have a built-in function that is separated with a ":"
- if (index > 0) {
- this.featurePathElementNames.add(token.substring(0, index));
- }
+ this.featurePathElementNames.add(token.substring(0, index));
}
// get built-in function
originalBuiltInName = token.substring(index + 1);
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java?rev=1745497&r1=1745496&r2=1745497&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java
Wed May 25 14:41:13 2016
@@ -46,7 +46,7 @@ public class FsIndex_flat<T extends Feat
final private Comparator<FeatureStructure> comparator;
FsIndex_flat(FsIndex_iicp<T> iicp) {
- super(iicp.getCASImpl(), iicp.fsIndex_singletype.getType(),
iicp.fsIndex_singletype.getIndexingStrategy(),
+ super(iicp.getCasImpl(), iicp.fsIndex_singletype.getType(),
iicp.fsIndex_singletype.getIndexingStrategy(),
iicp.fsIndex_singletype.getComparatorImplForIndexSpecs());
this.iicp = iicp;
indexedFSs = fillFlatArray();
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_iicp.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_iicp.java?rev=1745497&r1=1745496&r2=1745497&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_iicp.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_iicp.java
Wed May 25 14:41:13 2016
@@ -318,14 +318,9 @@ class FsIndex_iicp<T extends FeatureStru
// }
boolean subsumes(int superType, int subType) {
- return getCASImpl().getTypeSystemImpl().subsumes(superType, subType);
+ return getCasImpl().getTypeSystemImpl().subsumes(superType, subType);
}
- // debug
- CASImpl getCASImpl() {
- return fsIndex_singletype.casImpl;
- }
-
// for flat index support
// void addToIteratedSortedIndexes() {
// iteratedSortedIndexes.add(this);
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/MarkerImpl.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/MarkerImpl.java?rev=1745497&r1=1745496&r2=1745497&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/MarkerImpl.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/MarkerImpl.java
Wed May 25 14:41:13 2016
@@ -53,7 +53,6 @@ public class MarkerImpl implements Marke
public boolean isNew(FeatureStructure fs) {
//check if same CAS instance
- //TODO: define a CASRuntimeException
if (!isValid || !cas.isInCAS(fs)) {
throw new CASRuntimeException(CASRuntimeException.CAS_MISMATCH,
"FS and Marker are not from the same CAS.");
}
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/XmlAttribute.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/XmlAttribute.java?rev=1745497&r1=1745496&r2=1745497&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/XmlAttribute.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/XmlAttribute.java
Wed May 25 14:41:13 2016
@@ -22,8 +22,8 @@ package org.apache.uima.internal.util;
* Data structure representing an XML attribute.
*/
public class XmlAttribute {
- public String name;
- public String value;
+ final public String name;
+ final public String value;
public XmlAttribute(String name, String value) {
this.name = name;
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/XmlElementNameAndContents.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/XmlElementNameAndContents.java?rev=1745497&r1=1745496&r2=1745497&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/XmlElementNameAndContents.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/XmlElementNameAndContents.java
Wed May 25 14:41:13 2016
@@ -36,12 +36,12 @@ public class XmlElementNameAndContents {
this.attributes = attributes;
}
- public XmlElementName name;
+ final public XmlElementName name;
/**
* List of XmlAttribute objects each holding name and value of an attribute.
*/
- public List<XmlAttribute> attributes;
+ final public List<XmlAttribute> attributes;
- public String contents;
+ final public String contents;
}
\ No newline at end of file
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java?rev=1745497&r1=1745496&r2=1745497&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java
Wed May 25 14:41:13 2016
@@ -161,7 +161,7 @@ public class InstallationDescriptor impl
public String deploymentType = InstallationDescriptorHandler.STANDARD_TAG;
- public ServiceInfo serviceInfo = null;
+ public transient ServiceInfo serviceInfo = null; // ServiceInfo is not
serializable
public Hashtable<String, Properties> networkParams = null;
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTst.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTst.java?rev=1745497&r1=1745496&r2=1745497&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTst.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTst.java
Wed May 25 14:41:13 2016
@@ -185,8 +185,8 @@ public class CasTypeSystemMapperTst exte
public void testMissingType6() throws ResourceInitializationException {
ts1 = createTs(0, 0x1ffff, 0x1ffff);
- TypeImpl ts1t1 = t1t;
- TypeImpl ts1t2 = t2t;
+ ts1t1 = t1t;
+ ts1t2 = t2t;
ts2 = createTs(3, 0x1ffff, 0x1ffff);
CasTypeSystemMapper m = new CasTypeSystemMapper(ts1, ts2);
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java?rev=1745497&r1=1745496&r2=1745497&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java
Wed May 25 14:41:13 2016
@@ -83,6 +83,7 @@ public class SerDesTest6 extends TestCas
// -8,093,220,039,004,886,811
// final private static Random random = setRandom(seed =
-8093220039004886811L);
// final private static Random random = setRandom(seed =
-7_080_877_499_529_731_700L);
+// final private static Random random = setRandom(seed =
5_688_205_586_965_564_941L);
final private static Random random = setRandom();
static { System.out.format("SerDesTest6 RandomSeed: %,d%n", seed); }
private final String testDocText = "test document text";
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java?rev=1745497&r1=1745496&r2=1745497&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java
Wed May 25 14:41:13 2016
@@ -247,7 +247,9 @@ public class XCASDeserializerTest extend
XMLSerializer xmlSer = new XMLSerializer(sw, false);
xcasSer.serialize(cas, xmlSer.getContentHandler(), true, ootsd);
String xml = sw.getBuffer().toString();
- // System.out.println(xml);
+// System.out.println("debug writing temp/xmlv3.xml");
+// FileUtils.saveString2File(xml, new File("c:/temp/xmlv3.xml"));
+// System.out.println(xml);
// deserialize into a CAS that accepts the full typesystem
CAS cas2 = CasCreationUtils.createCas(typeSystem, new
TypePriorities_impl(), indexes);
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java?rev=1745497&r1=1745496&r2=1745497&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java
Wed May 25 14:41:13 2016
@@ -770,9 +770,9 @@ public class IteratorTest extends TestCa
private void findTestCas(FSIndex<FeatureStructure> index) {
AnnotationFS annot = (AnnotationFS) index.iterator().get(); // first
element
- if (null == index.find(annot)) {
- System.out.println("debug");
- }
+// if (null == index.find(annot)) {
+// System.out.println("debug");
+// }
assertNotNull(index.find(annot));
assertNull(index.find(this.cas.createAnnotation(this.annotationType, -1,
-1)));
}
