svn commit: r695824 - in /incubator/uima/sandbox/trunk/CasEditor: META-INF/MANIFEST.MF src/main/java/org/apache/uima/caseditor/editor/annotation/TokenDrawingStrategy.java src/main/java/org/apache/uima/caseditor/uima/CorporaCollectionReader.java

[jo...@apache.org]

Author: joern
Date: Tue Sep 16 05:06:23 2008
New Revision: 695824

URL: http://svn.apache.org/viewvc?rev=695824&view=rev
Log:
UIMA-1100 Fixed an off by one error

Modified:
    incubator/uima/sandbox/trunk/CasEditor/META-INF/MANIFEST.MF
    incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor/annotation/TokenDrawingStrategy.java
    incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/uima/CorporaCollectionReader.java

Modified: incubator/uima/sandbox/trunk/CasEditor/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditor/META-INF/MANIFEST.MF?rev=695824&r1=695823&r2=695824&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditor/META-INF/MANIFEST.MF (original)
+++ incubator/uima/sandbox/trunk/CasEditor/META-INF/MANIFEST.MF Tue Sep 16 05:06:23 2008
@@ -3,7 +3,7 @@
 Bundle-Name: UIMA Cas Editor
 Bundle-SymbolicName: org.apache.uima.caseditor;singleton:=true
 Bundle-Version: 2.2.2.incubating
-Bundle-ClassPath: ./caseditor.jar
+Bundle-ClassPath: ./caseditor.jar;./target/classes
 Bundle-Activator: org.apache.uima.caseditor.CasEditorPlugin
 Bundle-Vendor: The Apache Software Foundation
 Require-Bundle: org.eclipse.core.runtime,

Modified: incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor/annotation/TokenDrawingStrategy.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor/annotation/TokenDrawingStrategy.java?rev=695824&r1=695823&r2=695824&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor/annotation/TokenDrawingStrategy.java (original)
+++ incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor/annotation/TokenDrawingStrategy.java Tue Sep 16 05:06:23 2008
@@ -65,7 +65,7 @@
 
           boolean isDrawCloseBracket = annotationFS.getEnd() == offset + length;
           // and no space after offset
-          if (isDrawCloseBracket && offset + length <= textWidget.getText().length()
+          if (isDrawCloseBracket && offset + length < textWidget.getText().length()
                   && !isWhitespace(textWidget, offset + length)) {
             gc.drawLine(bounds.x + bounds.width, bounds.y + bounds.height - 1, bounds.x
                     + bounds.width - BRACKET_WIDTH, bounds.y + bounds.height - 1);

Modified: incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/uima/CorporaCollectionReader.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/uima/CorporaCollectionReader.java?rev=695824&r1=695823&r2=695824&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/uima/CorporaCollectionReader.java (original)
+++ incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/uima/CorporaCollectionReader.java Tue Sep 16 05:06:23 2008
@@ -22,6 +22,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.List;
 
 import org.apache.uima.cas.CAS;
 import org.apache.uima.cas_data.CasData;
@@ -38,7 +39,8 @@
  * {@link CorpusElement}s.
  */
 public class CorporaCollectionReader extends CollectionReader_ImplBase {
-  private Iterator mDocumentIterator;
+	
+  private Iterator<DocumentElement> documentIterator;
 
   /**
    * Sets the <code>CorpusElement</code>s to be read.
@@ -47,13 +49,13 @@
    */
   public void setCorpora(Collection<CorpusElement> corpora) {
     if (corpora != null) {
-      LinkedList<DocumentElement> documents = new LinkedList<DocumentElement>();
+      List<DocumentElement> documents = new LinkedList<DocumentElement>();
 
       for (CorpusElement element : corpora) {
         documents.addAll(element.getDocuments());
       }
 
-      mDocumentIterator = documents.iterator();
+      documentIterator = documents.iterator();
     }
   }
 
@@ -63,14 +65,14 @@
    * @throws CollectionException -
    */
   public void getNext(CAS cas) throws CollectionException {
-    DocumentElement document = (DocumentElement) mDocumentIterator.next();
+    DocumentElement document = (DocumentElement) documentIterator.next();
 
     CAS documentCas = null;
 
     try {
       documentCas = document.getDocument(false).getCAS();
     } catch (CoreException e) {
-      // TODO Auto-generated catch block
+      // TODO Handle this exception well
       e.printStackTrace();
     }
 
@@ -85,8 +87,8 @@
    * Checks if there is one more cas available.
    */
   public boolean hasNext() {
-    if (mDocumentIterator != null) {
-      return mDocumentIterator.hasNext();
+    if (documentIterator != null) {
+      return documentIterator.hasNext();
     } else {
       return false;
     }