You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by al...@apache.org on 2006/11/28 23:20:33 UTC
svn commit: r480239 [1/3] - in /incubator/uima/uimaj/trunk/uimaj-tools/src:
main/java/org/apache/uima/klt/ main/java/org/apache/uima/tools/
main/java/org/apache/uima/tools/annot_view/
main/java/org/apache/uima/tools/annot_view/ts_editor/ main/java/org/...
Author: alally
Date: Tue Nov 28 14:20:30 2006
New Revision: 480239
URL: http://svn.apache.org/viewvc?view=rev&rev=480239
Log:
UIMA-48: reformatted code due to previously incorrect setting
for the indent after line wrapping.
http://issues.apache.org/jira/browse/UIMA-48
Modified:
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/EntityAnnotation.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/EntityAnnotation_Type.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/Link.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/Link_Type.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/Referent.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/Referent_Type.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/RelationAnnotation.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/RelationAnnotation_Type.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/ValidateDescriptor.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/XCasAnnotationViewerMain.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/AnnotationDisplayCustomizationFrame.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/FSNode.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/FSTreeModel.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/Gladis.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/LogFileViewer.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/MainFrame.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/MultiMarkup.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/ts_editor/MainFrame.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/AnalysisEnginePanel.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/ConsumerPanel.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmFrame.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmPanel.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/MetaDataPanel.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/PerformanceReportDialog.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/TaePanel.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/FileSelector.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/XCasAnnotationViewerDialog.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/GUI.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/GuiErrorImpl.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/IMerge.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCasTypeTemplate.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCas_TypeTemplate.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Prefs.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPear.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMController.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMControllerHelper.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMUimaAgent.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/AnnotationFeaturesViewer.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorEditor.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorParser.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorRenderer.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/LabelCellEditor.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/MyCellRenderer.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEditor.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEntry.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapTable.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapXmlParser.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/FileSelector.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/ListSelector.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/SpringUtilities.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview/AnnotationViewGenerator.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasAnnotationViewer.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasAnnotationViewerApplet.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasTreeViewer.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasTreeViewerApplet.java
incubator/uima/uimaj/trunk/uimaj-tools/src/test/java/org/apache/uima/tools/pear/merger/PearMergerTest.java
incubator/uima/uimaj/trunk/uimaj-tools/src/test/java/org/apache/uima/tools/viewer/CasAnnotationViewerTest.java
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/EntityAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/EntityAnnotation.java?view=diff&rev=480239&r1=480238&r2=480239
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/EntityAnnotation.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/EntityAnnotation.java Tue Nov 28 14:20:30 2006
@@ -33,7 +33,7 @@
public class EntityAnnotation extends Annotation {
public String toString() {
return "(ENTITY-ANN \"" + getCoveredText() + "\" " + getComponentId() + " "
- + getClass().getName() + ":" + getMentionType() + ")";
+ + getClass().getName() + ":" + getMentionType() + ")";
}
/**
@@ -104,7 +104,7 @@
if (EntityAnnotation_Type.featOkTst && ((EntityAnnotation_Type) jcasType).casFeat_links == null)
JCas.throwFeatMissing("links", "org.apache.uima.klt.EntityAnnotation");
return (FSList) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
- ((EntityAnnotation_Type) jcasType).casFeatCode_links)));
+ ((EntityAnnotation_Type) jcasType).casFeatCode_links)));
}
/**
@@ -116,7 +116,7 @@
if (EntityAnnotation_Type.featOkTst && ((EntityAnnotation_Type) jcasType).casFeat_links == null)
JCas.throwFeatMissing("links", "org.apache.uima.klt.EntityAnnotation");
jcasType.ll_cas.ll_setRefValue(addr, ((EntityAnnotation_Type) jcasType).casFeatCode_links,
- jcasType.ll_cas.ll_getFSRef(v));
+ jcasType.ll_cas.ll_getFSRef(v));
}
// *--------------*
@@ -129,10 +129,10 @@
*/
public String getComponentId() {
if (EntityAnnotation_Type.featOkTst
- && ((EntityAnnotation_Type) jcasType).casFeat_componentId == null)
+ && ((EntityAnnotation_Type) jcasType).casFeat_componentId == null)
JCas.throwFeatMissing("componentId", "org.apache.uima.klt.EntityAnnotation");
return jcasType.ll_cas.ll_getStringValue(addr,
- ((EntityAnnotation_Type) jcasType).casFeatCode_componentId);
+ ((EntityAnnotation_Type) jcasType).casFeatCode_componentId);
}
/**
@@ -142,10 +142,10 @@
*/
public void setComponentId(String v) {
if (EntityAnnotation_Type.featOkTst
- && ((EntityAnnotation_Type) jcasType).casFeat_componentId == null)
+ && ((EntityAnnotation_Type) jcasType).casFeat_componentId == null)
JCas.throwFeatMissing("componentId", "org.apache.uima.klt.EntityAnnotation");
jcasType.ll_cas.ll_setStringValue(addr,
- ((EntityAnnotation_Type) jcasType).casFeatCode_componentId, v);
+ ((EntityAnnotation_Type) jcasType).casFeatCode_componentId, v);
}
// *--------------*
@@ -158,10 +158,10 @@
*/
public String getMentionType() {
if (EntityAnnotation_Type.featOkTst
- && ((EntityAnnotation_Type) jcasType).casFeat_mentionType == null)
+ && ((EntityAnnotation_Type) jcasType).casFeat_mentionType == null)
JCas.throwFeatMissing("mentionType", "org.apache.uima.klt.EntityAnnotation");
return jcasType.ll_cas.ll_getStringValue(addr,
- ((EntityAnnotation_Type) jcasType).casFeatCode_mentionType);
+ ((EntityAnnotation_Type) jcasType).casFeatCode_mentionType);
}
/**
@@ -171,9 +171,9 @@
*/
public void setMentionType(String v) {
if (EntityAnnotation_Type.featOkTst
- && ((EntityAnnotation_Type) jcasType).casFeat_mentionType == null)
+ && ((EntityAnnotation_Type) jcasType).casFeat_mentionType == null)
JCas.throwFeatMissing("mentionType", "org.apache.uima.klt.EntityAnnotation");
jcasType.ll_cas.ll_setStringValue(addr,
- ((EntityAnnotation_Type) jcasType).casFeatCode_mentionType, v);
+ ((EntityAnnotation_Type) jcasType).casFeatCode_mentionType, v);
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/EntityAnnotation_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/EntityAnnotation_Type.java?view=diff&rev=480239&r1=480238&r2=480239
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/EntityAnnotation_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/EntityAnnotation_Type.java Tue Nov 28 14:20:30 2006
@@ -138,17 +138,17 @@
casFeat_links = jcas.getRequiredFeatureDE(casType, "links", "uima.cas.FSList", featOkTst);
casFeatCode_links = (null == casFeat_links) ? JCas.INVALID_FEATURE_CODE
- : ((FeatureImpl) casFeat_links).getCode();
+ : ((FeatureImpl) casFeat_links).getCode();
casFeat_componentId = jcas.getRequiredFeatureDE(casType, "componentId", "uima.cas.String",
- featOkTst);
+ featOkTst);
casFeatCode_componentId = (null == casFeat_componentId) ? JCas.INVALID_FEATURE_CODE
- : ((FeatureImpl) casFeat_componentId).getCode();
+ : ((FeatureImpl) casFeat_componentId).getCode();
casFeat_mentionType = jcas.getRequiredFeatureDE(casType, "mentionType", "uima.cas.String",
- featOkTst);
+ featOkTst);
casFeatCode_mentionType = (null == casFeat_mentionType) ? JCas.INVALID_FEATURE_CODE
- : ((FeatureImpl) casFeat_mentionType).getCode();
+ : ((FeatureImpl) casFeat_mentionType).getCode();
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/Link.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/Link.java?view=diff&rev=480239&r1=480238&r2=480239
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/Link.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/Link.java Tue Nov 28 14:20:30 2006
@@ -98,7 +98,7 @@
try {
JCas jcas = aFrom.getCAS().getJCas();
java.lang.reflect.Constructor linkConstructor = linkClass
- .getConstructor(new Class[] { JCas.class });
+ .getConstructor(new Class[] { JCas.class });
newLink = (Link) linkConstructor.newInstance(new Object[] { jcas });
} catch (Exception e) {
}
@@ -227,7 +227,7 @@
if (Link_Type.featOkTst && ((Link_Type) jcasType).casFeat_from == null)
JCas.throwFeatMissing("from", "org.apache.uima.klt.Link");
return (TOP) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
- ((Link_Type) jcasType).casFeatCode_from)));
+ ((Link_Type) jcasType).casFeatCode_from)));
}
/**
@@ -239,7 +239,7 @@
if (Link_Type.featOkTst && ((Link_Type) jcasType).casFeat_from == null)
JCas.throwFeatMissing("from", "org.apache.uima.klt.Link");
jcasType.ll_cas.ll_setRefValue(addr, ((Link_Type) jcasType).casFeatCode_from, jcasType.ll_cas
- .ll_getFSRef(v));
+ .ll_getFSRef(v));
}
// *--------------*
@@ -254,7 +254,7 @@
if (Link_Type.featOkTst && ((Link_Type) jcasType).casFeat_to == null)
JCas.throwFeatMissing("to", "org.apache.uima.klt.Link");
return (TOP) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
- ((Link_Type) jcasType).casFeatCode_to)));
+ ((Link_Type) jcasType).casFeatCode_to)));
}
/**
@@ -266,7 +266,7 @@
if (Link_Type.featOkTst && ((Link_Type) jcasType).casFeat_to == null)
JCas.throwFeatMissing("to", "org.apache.uima.klt.Link");
jcasType.ll_cas.ll_setRefValue(addr, ((Link_Type) jcasType).casFeatCode_to, jcasType.ll_cas
- .ll_getFSRef(v));
+ .ll_getFSRef(v));
}
// *--------------*
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/Link_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/Link_Type.java?view=diff&rev=480239&r1=480238&r2=480239
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/Link_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/Link_Type.java Tue Nov 28 14:20:30 2006
@@ -136,17 +136,17 @@
casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl) this.casType, getFSGenerator());
casFeat_componentId = jcas.getRequiredFeatureDE(casType, "componentId", "uima.cas.String",
- featOkTst);
+ featOkTst);
casFeatCode_componentId = (null == casFeat_componentId) ? JCas.INVALID_FEATURE_CODE
- : ((FeatureImpl) casFeat_componentId).getCode();
+ : ((FeatureImpl) casFeat_componentId).getCode();
casFeat_from = jcas.getRequiredFeatureDE(casType, "from", "uima.cas.TOP", featOkTst);
casFeatCode_from = (null == casFeat_from) ? JCas.INVALID_FEATURE_CODE
- : ((FeatureImpl) casFeat_from).getCode();
+ : ((FeatureImpl) casFeat_from).getCode();
casFeat_to = jcas.getRequiredFeatureDE(casType, "to", "uima.cas.TOP", featOkTst);
casFeatCode_to = (null == casFeat_to) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl) casFeat_to)
- .getCode();
+ .getCode();
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/Referent.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/Referent.java?view=diff&rev=480239&r1=480238&r2=480239
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/Referent.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/Referent.java Tue Nov 28 14:20:30 2006
@@ -180,7 +180,7 @@
if (Referent_Type.featOkTst && ((Referent_Type) jcasType).casFeat_links == null)
JCas.throwFeatMissing("links", "org.apache.uima.klt.Referent");
return (FSList) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
- ((Referent_Type) jcasType).casFeatCode_links)));
+ ((Referent_Type) jcasType).casFeatCode_links)));
}
/**
@@ -192,7 +192,7 @@
if (Referent_Type.featOkTst && ((Referent_Type) jcasType).casFeat_links == null)
JCas.throwFeatMissing("links", "org.apache.uima.klt.Referent");
jcasType.ll_cas.ll_setRefValue(addr, ((Referent_Type) jcasType).casFeatCode_links,
- jcasType.ll_cas.ll_getFSRef(v));
+ jcasType.ll_cas.ll_getFSRef(v));
}
// *--------------*
@@ -207,7 +207,7 @@
if (Referent_Type.featOkTst && ((Referent_Type) jcasType).casFeat_classes == null)
JCas.throwFeatMissing("classes", "org.apache.uima.klt.Referent");
return (StringArray) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
- ((Referent_Type) jcasType).casFeatCode_classes)));
+ ((Referent_Type) jcasType).casFeatCode_classes)));
}
/**
@@ -219,7 +219,7 @@
if (Referent_Type.featOkTst && ((Referent_Type) jcasType).casFeat_classes == null)
JCas.throwFeatMissing("classes", "org.apache.uima.klt.Referent");
jcasType.ll_cas.ll_setRefValue(addr, ((Referent_Type) jcasType).casFeatCode_classes,
- jcasType.ll_cas.ll_getFSRef(v));
+ jcasType.ll_cas.ll_getFSRef(v));
}
/**
@@ -231,9 +231,9 @@
if (Referent_Type.featOkTst && ((Referent_Type) jcasType).casFeat_classes == null)
JCas.throwFeatMissing("classes", "org.apache.uima.klt.Referent");
jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr,
- ((Referent_Type) jcasType).casFeatCode_classes), i);
+ ((Referent_Type) jcasType).casFeatCode_classes), i);
return jcasType.ll_cas.ll_getStringArrayValue(jcasType.ll_cas.ll_getRefValue(addr,
- ((Referent_Type) jcasType).casFeatCode_classes), i);
+ ((Referent_Type) jcasType).casFeatCode_classes), i);
}
/**
@@ -245,9 +245,9 @@
if (Referent_Type.featOkTst && ((Referent_Type) jcasType).casFeat_classes == null)
JCas.throwFeatMissing("classes", "org.apache.uima.klt.Referent");
jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr,
- ((Referent_Type) jcasType).casFeatCode_classes), i);
+ ((Referent_Type) jcasType).casFeatCode_classes), i);
jcasType.ll_cas.ll_setStringArrayValue(jcasType.ll_cas.ll_getRefValue(addr,
- ((Referent_Type) jcasType).casFeatCode_classes), i, v);
+ ((Referent_Type) jcasType).casFeatCode_classes), i, v);
}
// *--------------*
@@ -262,7 +262,7 @@
if (Referent_Type.featOkTst && ((Referent_Type) jcasType).casFeat_canonicalForm == null)
JCas.throwFeatMissing("canonicalForm", "org.apache.uima.klt.Referent");
return jcasType.ll_cas.ll_getStringValue(addr,
- ((Referent_Type) jcasType).casFeatCode_canonicalForm);
+ ((Referent_Type) jcasType).casFeatCode_canonicalForm);
}
/**
@@ -274,8 +274,7 @@
if (Referent_Type.featOkTst && ((Referent_Type) jcasType).casFeat_canonicalForm == null)
JCas.throwFeatMissing("canonicalForm", "org.apache.uima.klt.Referent");
jcasType.ll_cas
- .ll_setStringValue(addr, ((Referent_Type) jcasType).casFeatCode_canonicalForm,
- v);
+ .ll_setStringValue(addr, ((Referent_Type) jcasType).casFeatCode_canonicalForm, v);
}
// *--------------*
@@ -290,7 +289,7 @@
if (Referent_Type.featOkTst && ((Referent_Type) jcasType).casFeat_variantForms == null)
JCas.throwFeatMissing("variantForms", "org.apache.uima.klt.Referent");
return (StringList) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
- ((Referent_Type) jcasType).casFeatCode_variantForms)));
+ ((Referent_Type) jcasType).casFeatCode_variantForms)));
}
/**
@@ -302,7 +301,7 @@
if (Referent_Type.featOkTst && ((Referent_Type) jcasType).casFeat_variantForms == null)
JCas.throwFeatMissing("variantForms", "org.apache.uima.klt.Referent");
jcasType.ll_cas.ll_setRefValue(addr, ((Referent_Type) jcasType).casFeatCode_variantForms,
- jcasType.ll_cas.ll_getFSRef(v));
+ jcasType.ll_cas.ll_getFSRef(v));
}
// *--------------*
@@ -317,7 +316,7 @@
if (Referent_Type.featOkTst && ((Referent_Type) jcasType).casFeat_componentId == null)
JCas.throwFeatMissing("componentId", "org.apache.uima.klt.Referent");
return jcasType.ll_cas.ll_getStringValue(addr,
- ((Referent_Type) jcasType).casFeatCode_componentId);
+ ((Referent_Type) jcasType).casFeatCode_componentId);
}
/**
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/Referent_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/Referent_Type.java?view=diff&rev=480239&r1=480238&r2=480239
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/Referent_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/Referent_Type.java Tue Nov 28 14:20:30 2006
@@ -172,7 +172,7 @@
JCas.throwFeatMissing("classes", "org.apache.uima.klt.Referent");
if (lowLevelTypeChecks)
return ll_cas.ll_getStringArrayValue(ll_cas.ll_getRefValue(addr, casFeatCode_classes), i,
- true);
+ true);
jcas.checkArrayBounds(ll_cas.ll_getRefValue(addr, casFeatCode_classes), i);
return ll_cas.ll_getStringArrayValue(ll_cas.ll_getRefValue(addr, casFeatCode_classes), i);
}
@@ -218,31 +218,31 @@
casFeat_links = jcas.getRequiredFeatureDE(casType, "links", "uima.cas.FSList", featOkTst);
casFeatCode_links = (null == casFeat_links) ? JCas.INVALID_FEATURE_CODE
- : ((FeatureImpl) casFeat_links).getCode();
+ : ((FeatureImpl) casFeat_links).getCode();
casFeat_componentId = jcas.getRequiredFeatureDE(casType, "componentId", "uima.cas.String",
- featOkTst);
+ featOkTst);
casFeatCode_componentId = (null == casFeat_componentId) ? JCas.INVALID_FEATURE_CODE
- : ((FeatureImpl) casFeat_componentId).getCode();
+ : ((FeatureImpl) casFeat_componentId).getCode();
casFeat_classes = jcas.getRequiredFeatureDE(casType, "classes", "uima.cas.StringArray",
- featOkTst);
+ featOkTst);
casFeatCode_classes = (null == casFeat_classes) ? JCas.INVALID_FEATURE_CODE
- : ((FeatureImpl) casFeat_classes).getCode();
+ : ((FeatureImpl) casFeat_classes).getCode();
casFeat_canonicalForm = jcas.getRequiredFeatureDE(casType, "canonicalForm", "uima.cas.String",
- featOkTst);
+ featOkTst);
casFeatCode_canonicalForm = (null == casFeat_canonicalForm) ? JCas.INVALID_FEATURE_CODE
- : ((FeatureImpl) casFeat_canonicalForm).getCode();
+ : ((FeatureImpl) casFeat_canonicalForm).getCode();
casFeat_variantForms = jcas.getRequiredFeatureDE(casType, "variantForms",
- "uima.cas.StringList", featOkTst);
+ "uima.cas.StringList", featOkTst);
casFeatCode_variantForms = (null == casFeat_variantForms) ? JCas.INVALID_FEATURE_CODE
- : ((FeatureImpl) casFeat_variantForms).getCode();
+ : ((FeatureImpl) casFeat_variantForms).getCode();
casFeat_id = jcas.getRequiredFeatureDE(casType, "id", "uima.cas.String", featOkTst);
casFeatCode_id = (null == casFeat_id) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl) casFeat_id)
- .getCode();
+ .getCode();
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/RelationAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/RelationAnnotation.java?view=diff&rev=480239&r1=480238&r2=480239
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/RelationAnnotation.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/RelationAnnotation.java Tue Nov 28 14:20:30 2006
@@ -33,7 +33,7 @@
public class RelationAnnotation extends Annotation {
public String toString() {
return "(RELATION-ANN " + getComponentId() + " " + getClass().getName() + ":"
- + getRelationArgs() + ")";
+ + getRelationArgs() + ")";
}
/**
@@ -102,10 +102,10 @@
*/
public FSList getLinks() {
if (RelationAnnotation_Type.featOkTst
- && ((RelationAnnotation_Type) jcasType).casFeat_links == null)
+ && ((RelationAnnotation_Type) jcasType).casFeat_links == null)
JCas.throwFeatMissing("links", "org.apache.uima.klt.RelationAnnotation");
return (FSList) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
- ((RelationAnnotation_Type) jcasType).casFeatCode_links)));
+ ((RelationAnnotation_Type) jcasType).casFeatCode_links)));
}
/**
@@ -115,10 +115,10 @@
*/
public void setLinks(FSList v) {
if (RelationAnnotation_Type.featOkTst
- && ((RelationAnnotation_Type) jcasType).casFeat_links == null)
+ && ((RelationAnnotation_Type) jcasType).casFeat_links == null)
JCas.throwFeatMissing("links", "org.apache.uima.klt.RelationAnnotation");
jcasType.ll_cas.ll_setRefValue(addr, ((RelationAnnotation_Type) jcasType).casFeatCode_links,
- jcasType.ll_cas.ll_getFSRef(v));
+ jcasType.ll_cas.ll_getFSRef(v));
}
// *--------------*
@@ -131,10 +131,10 @@
*/
public Annotation getPredicate() {
if (RelationAnnotation_Type.featOkTst
- && ((RelationAnnotation_Type) jcasType).casFeat_predicate == null)
+ && ((RelationAnnotation_Type) jcasType).casFeat_predicate == null)
JCas.throwFeatMissing("predicate", "org.apache.uima.klt.RelationAnnotation");
return (Annotation) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
- ((RelationAnnotation_Type) jcasType).casFeatCode_predicate)));
+ ((RelationAnnotation_Type) jcasType).casFeatCode_predicate)));
}
/**
@@ -144,11 +144,11 @@
*/
public void setPredicate(Annotation v) {
if (RelationAnnotation_Type.featOkTst
- && ((RelationAnnotation_Type) jcasType).casFeat_predicate == null)
+ && ((RelationAnnotation_Type) jcasType).casFeat_predicate == null)
JCas.throwFeatMissing("predicate", "org.apache.uima.klt.RelationAnnotation");
jcasType.ll_cas.ll_setRefValue(addr,
- ((RelationAnnotation_Type) jcasType).casFeatCode_predicate, jcasType.ll_cas
- .ll_getFSRef(v));
+ ((RelationAnnotation_Type) jcasType).casFeatCode_predicate, jcasType.ll_cas
+ .ll_getFSRef(v));
}
// *--------------*
@@ -161,10 +161,10 @@
*/
public RelationArgs getRelationArgs() {
if (RelationAnnotation_Type.featOkTst
- && ((RelationAnnotation_Type) jcasType).casFeat_relationArgs == null)
+ && ((RelationAnnotation_Type) jcasType).casFeat_relationArgs == null)
JCas.throwFeatMissing("relationArgs", "org.apache.uima.klt.RelationAnnotation");
return (RelationArgs) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
- ((RelationAnnotation_Type) jcasType).casFeatCode_relationArgs)));
+ ((RelationAnnotation_Type) jcasType).casFeatCode_relationArgs)));
}
/**
@@ -174,11 +174,11 @@
*/
public void setRelationArgs(RelationArgs v) {
if (RelationAnnotation_Type.featOkTst
- && ((RelationAnnotation_Type) jcasType).casFeat_relationArgs == null)
+ && ((RelationAnnotation_Type) jcasType).casFeat_relationArgs == null)
JCas.throwFeatMissing("relationArgs", "org.apache.uima.klt.RelationAnnotation");
jcasType.ll_cas.ll_setRefValue(addr,
- ((RelationAnnotation_Type) jcasType).casFeatCode_relationArgs, jcasType.ll_cas
- .ll_getFSRef(v));
+ ((RelationAnnotation_Type) jcasType).casFeatCode_relationArgs, jcasType.ll_cas
+ .ll_getFSRef(v));
}
// *--------------*
@@ -191,10 +191,10 @@
*/
public String getComponentId() {
if (RelationAnnotation_Type.featOkTst
- && ((RelationAnnotation_Type) jcasType).casFeat_componentId == null)
+ && ((RelationAnnotation_Type) jcasType).casFeat_componentId == null)
JCas.throwFeatMissing("componentId", "org.apache.uima.klt.RelationAnnotation");
return jcasType.ll_cas.ll_getStringValue(addr,
- ((RelationAnnotation_Type) jcasType).casFeatCode_componentId);
+ ((RelationAnnotation_Type) jcasType).casFeatCode_componentId);
}
/**
@@ -204,10 +204,10 @@
*/
public void setComponentId(String v) {
if (RelationAnnotation_Type.featOkTst
- && ((RelationAnnotation_Type) jcasType).casFeat_componentId == null)
+ && ((RelationAnnotation_Type) jcasType).casFeat_componentId == null)
JCas.throwFeatMissing("componentId", "org.apache.uima.klt.RelationAnnotation");
jcasType.ll_cas.ll_setStringValue(addr,
- ((RelationAnnotation_Type) jcasType).casFeatCode_componentId, v);
+ ((RelationAnnotation_Type) jcasType).casFeatCode_componentId, v);
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/RelationAnnotation_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/RelationAnnotation_Type.java?view=diff&rev=480239&r1=480238&r2=480239
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/RelationAnnotation_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/klt/RelationAnnotation_Type.java Tue Nov 28 14:20:30 2006
@@ -66,7 +66,7 @@
* @modifiable
*/
public final static boolean featOkTst = JCas
- .getFeatOkTst("org.apache.uima.klt.RelationAnnotation");
+ .getFeatOkTst("org.apache.uima.klt.RelationAnnotation");
/** @generated */
final Feature casFeat_links;
@@ -159,22 +159,22 @@
casFeat_links = jcas.getRequiredFeatureDE(casType, "links", "uima.cas.FSList", featOkTst);
casFeatCode_links = (null == casFeat_links) ? JCas.INVALID_FEATURE_CODE
- : ((FeatureImpl) casFeat_links).getCode();
+ : ((FeatureImpl) casFeat_links).getCode();
casFeat_componentId = jcas.getRequiredFeatureDE(casType, "componentId", "uima.cas.String",
- featOkTst);
+ featOkTst);
casFeatCode_componentId = (null == casFeat_componentId) ? JCas.INVALID_FEATURE_CODE
- : ((FeatureImpl) casFeat_componentId).getCode();
+ : ((FeatureImpl) casFeat_componentId).getCode();
casFeat_predicate = jcas.getRequiredFeatureDE(casType, "predicate", "uima.tcas.Annotation",
- featOkTst);
+ featOkTst);
casFeatCode_predicate = (null == casFeat_predicate) ? JCas.INVALID_FEATURE_CODE
- : ((FeatureImpl) casFeat_predicate).getCode();
+ : ((FeatureImpl) casFeat_predicate).getCode();
casFeat_relationArgs = jcas.getRequiredFeatureDE(casType, "relationArgs",
- "org.apache.uima.klt.RelationArgs", featOkTst);
+ "org.apache.uima.klt.RelationArgs", featOkTst);
casFeatCode_relationArgs = (null == casFeat_relationArgs) ? JCas.INVALID_FEATURE_CODE
- : ((FeatureImpl) casFeat_relationArgs).getCode();
+ : ((FeatureImpl) casFeat_relationArgs).getCode();
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/ValidateDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/ValidateDescriptor.java?view=diff&rev=480239&r1=480238&r2=480239
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/ValidateDescriptor.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/ValidateDescriptor.java Tue Nov 28 14:20:30 2006
@@ -41,8 +41,7 @@
public static void main(String[] args) throws Exception {
if (args.length != 1) {
System.err
- .println("Usage: java " + ValidateDescriptor.class.getName()
- + " <descriptor file>");
+ .println("Usage: java " + ValidateDescriptor.class.getName() + " <descriptor file>");
System.exit(1);
}
System.out.println("Parsing...");
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/XCasAnnotationViewerMain.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/XCasAnnotationViewerMain.java?view=diff&rev=480239&r1=480238&r2=480239
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/XCasAnnotationViewerMain.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/XCasAnnotationViewerMain.java Tue Nov 28 14:20:30 2006
@@ -78,18 +78,18 @@
private static final long serialVersionUID = -3201723535833938833L;
private static final String HELP_MESSAGE = "Instructions for using XCAS Annotation Viewer:\n\n"
- + "1) In the \"Input Directory\" field, either type or use the browse\n"
- + "button to select a directory containing the analyzed documents\n "
- + "(in XMI or XCAS format) that you want to view.\n\n"
- + "2) In the \"TAE Descriptor File\" field, either type or use the browse\n"
- + "button to select the TAE descriptor for the TAE that generated the\n"
- + "XCAS files. (This is needed for type system infornation only.\n"
- + "Analysis will not be redone.)\n\n"
- + "3) Click the \"View\" button at the buttom of the window.\n\n"
- + "A list of the analyzed documents will be displayed.\n\n\n"
- + "4) Select the view type -- either the Java annotation viewer, HTML,\n"
- + "or XML. The Java annotation viewer is recommended.\n\n"
- + "5) Double-click on a document to view it.\n";
+ + "1) In the \"Input Directory\" field, either type or use the browse\n"
+ + "button to select a directory containing the analyzed documents\n "
+ + "(in XMI or XCAS format) that you want to view.\n\n"
+ + "2) In the \"TAE Descriptor File\" field, either type or use the browse\n"
+ + "button to select the TAE descriptor for the TAE that generated the\n"
+ + "XCAS files. (This is needed for type system infornation only.\n"
+ + "Analysis will not be redone.)\n\n"
+ + "3) Click the \"View\" button at the buttom of the window.\n\n"
+ + "A list of the analyzed documents will be displayed.\n\n\n"
+ + "4) Select the view type -- either the Java annotation viewer, HTML,\n"
+ + "or XML. The Java annotation viewer is recommended.\n\n"
+ + "5) Double-click on a document to view it.\n";
private File uimaHomeDir;
@@ -170,14 +170,14 @@
// Set default values for input fields
File inputDir = new File(uimaHomeDir, "docs/examples/data/processed");
inputFileSelector = new FileSelector("", "Input Directory", JFileChooser.DIRECTORIES_ONLY,
- inputDir);
+ inputDir);
inputFileSelector.setSelected(inputDir.getAbsolutePath());
taeDescriptorFileSelector = new FileSelector("", "TAE Descriptor File",
- JFileChooser.FILES_ONLY, uimaHomeDir);
+ JFileChooser.FILES_ONLY, uimaHomeDir);
File descriptorFile = new File(uimaHomeDir,
- "docs/examples/descriptors/analysis_engine/PersonTitleAnnotator.xml");
+ "docs/examples/descriptors/analysis_engine/PersonTitleAnnotator.xml");
taeDescriptorFileSelector.setSelected(descriptorFile.getAbsolutePath());
controlPanel.add(labelInputDir);
@@ -186,8 +186,8 @@
controlPanel.add(taeDescriptorFileSelector);
SpringUtilities.makeCompactGrid(controlPanel, 2, 2, // rows, cols
- 4, 4, // initX, initY
- 4, 4); // xPad, yPad
+ 4, 4, // initX, initY
+ 4, 4); // xPad, yPad
// Event Handlling of "Exit" Menu Item
exitMenuItem.addActionListener(new ActionListener() {
@@ -208,7 +208,7 @@
helpMenuItem.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ae) {
JOptionPane.showMessageDialog(XCasAnnotationViewerMain.this, HELP_MESSAGE,
- "Annotation Viewer Help", JOptionPane.PLAIN_MESSAGE);
+ "Annotation Viewer Help", JOptionPane.PLAIN_MESSAGE);
}
});
@@ -248,7 +248,7 @@
}
public void viewDocuments() throws InvalidXMLException, IOException,
- ResourceInitializationException {
+ ResourceInitializationException {
File descriptorFile = new File(taeDescriptorFileSelector.getSelected());
if (!descriptorFile.exists() || descriptorFile.isDirectory()) {
displayError("Descriptor File \"" + descriptorFile.getPath() + "\" does not exist.");
@@ -268,7 +268,7 @@
if (descriptor instanceof AnalysisEngineDescription) {
tcas = CasCreationUtils.createTCas((AnalysisEngineDescription) descriptor);
styleMapFile = getStyleMapFile((AnalysisEngineDescription) descriptor, descriptorFile
- .getPath());
+ .getPath());
} else if (descriptor instanceof TypeSystemDescription) {
TypeSystemDescription tsDesc = (TypeSystemDescription) descriptor;
tsDesc.resolveImports();
@@ -276,7 +276,7 @@
styleMapFile = getStyleMapFile((TypeSystemDescription) descriptor, descriptorFile.getPath());
} else {
displayError("Invalid Descriptor File \"" + descriptorFile.getPath() + "\""
- + "Must be either an AnalysisEngine or TypeSystem descriptor.");
+ + "Must be either an AnalysisEngine or TypeSystem descriptor.");
return;
}
@@ -287,8 +287,8 @@
// output dir is the directory containing XCAS files.
prefsMed.setOutputDir(inputDir.toString());
XCasAnnotationViewerDialog viewerDialog = new XCasAnnotationViewerDialog(this,
- "Analyzed Documents", prefsMed, styleMapFile, null, tcas.getTypeSystem(), null,
- false, tcas);
+ "Analyzed Documents", prefsMed, styleMapFile, null, tcas.getTypeSystem(), null, false,
+ tcas);
viewerDialog.pack();
viewerDialog.setModal(true);
viewerDialog.setVisible(true);
@@ -301,7 +301,7 @@
* @throws IOException
*/
private File getStyleMapFile(AnalysisEngineDescription tad, String descFileName)
- throws IOException {
+ throws IOException {
File styleMapFile = getStyleMapFileName(descFileName);
if (!styleMapFile.exists()) {
// generate default style map
@@ -377,12 +377,12 @@
// figure defaults
File defaultInputDir = new File(uimaHomeDir, "docs/examples/data/processed");
File defaultTaeDescriptorFile = new File(uimaHomeDir,
- "docs/examples/descriptors/analysis_engine/PersonTitleAnnotator.xml");
+ "docs/examples/descriptors/analysis_engine/PersonTitleAnnotator.xml");
// restore preferences
inputFileSelector.setSelected(prefs.get("inDir", defaultInputDir.toString()));
taeDescriptorFileSelector.setSelected(prefs.get("taeDescriptorFile", defaultTaeDescriptorFile
- .toString()));
+ .toString()));
}
/**
@@ -414,7 +414,7 @@
}
JOptionPane.showMessageDialog(XCasAnnotationViewerMain.this, buf.toString(), "Error",
- JOptionPane.ERROR_MESSAGE);
+ JOptionPane.ERROR_MESSAGE);
}
/**
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/AnnotationDisplayCustomizationFrame.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/AnnotationDisplayCustomizationFrame.java?view=diff&rev=480239&r1=480238&r2=480239
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/AnnotationDisplayCustomizationFrame.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/AnnotationDisplayCustomizationFrame.java Tue Nov 28 14:20:30 2006
@@ -67,7 +67,7 @@
*/
public void valueChanged(TreeSelectionEvent event) {
DefaultMutableTreeNode node = (DefaultMutableTreeNode) AnnotationDisplayCustomizationFrame.this.tree
- .getLastSelectedPathComponent();
+ .getLastSelectedPathComponent();
String typeName = (String) node.getUserObject();
if (typeName.equals(AnnotationDisplayCustomizationFrame.this.currentTypeName)) {
return;
@@ -81,7 +81,7 @@
public void actionPerformed(ActionEvent event) {
Color color = JColorChooser.showDialog(AnnotationDisplayCustomizationFrame.this,
- "Choose color", AnnotationDisplayCustomizationFrame.this.bgColor);
+ "Choose color", AnnotationDisplayCustomizationFrame.this.bgColor);
if (color != null) {
AnnotationDisplayCustomizationFrame.this.bgColor = color;
AnnotationDisplayCustomizationFrame.this.bgIcon.setColor(color);
@@ -98,7 +98,7 @@
public void actionPerformed(ActionEvent event) {
Color color = JColorChooser.showDialog(AnnotationDisplayCustomizationFrame.this,
- "Choose color", AnnotationDisplayCustomizationFrame.this.fgColor);
+ "Choose color", AnnotationDisplayCustomizationFrame.this.fgColor);
if (color != null) {
AnnotationDisplayCustomizationFrame.this.fgColor = color;
AnnotationDisplayCustomizationFrame.this.fgIcon.setColor(color);
@@ -115,19 +115,19 @@
public void actionPerformed(ActionEvent event) {
Style style = (Style) AnnotationDisplayCustomizationFrame.this.styleMap
- .get(AnnotationDisplayCustomizationFrame.this.currentTypeName);
+ .get(AnnotationDisplayCustomizationFrame.this.currentTypeName);
if (style == null) {
style = AnnotationDisplayCustomizationFrame.this.textPane.addStyle(
- AnnotationDisplayCustomizationFrame.this.currentTypeName,
- (Style) AnnotationDisplayCustomizationFrame.this.styleMap
- .get(TCAS.TYPE_NAME_ANNOTATION));
+ AnnotationDisplayCustomizationFrame.this.currentTypeName,
+ (Style) AnnotationDisplayCustomizationFrame.this.styleMap
+ .get(TCAS.TYPE_NAME_ANNOTATION));
}
StyleConstants.setForeground(style, StyleConstants
- .getForeground(AnnotationDisplayCustomizationFrame.this.currentStyle));
+ .getForeground(AnnotationDisplayCustomizationFrame.this.currentStyle));
StyleConstants.setBackground(style, StyleConstants
- .getBackground(AnnotationDisplayCustomizationFrame.this.currentStyle));
+ .getBackground(AnnotationDisplayCustomizationFrame.this.currentStyle));
AnnotationDisplayCustomizationFrame.this.styleMap.put(
- AnnotationDisplayCustomizationFrame.this.currentTypeName, style);
+ AnnotationDisplayCustomizationFrame.this.currentTypeName, style);
enableButtons(false);
AnnotationDisplayCustomizationFrame.this.repaint();
}
@@ -138,18 +138,18 @@
public void actionPerformed(ActionEvent event) {
Style style = (Style) AnnotationDisplayCustomizationFrame.this.styleMap
- .get(AnnotationDisplayCustomizationFrame.this.currentTypeName);
+ .get(AnnotationDisplayCustomizationFrame.this.currentTypeName);
if (style == null) {
style = (Style) AnnotationDisplayCustomizationFrame.this.styleMap
- .get(TCAS.TYPE_NAME_ANNOTATION);
+ .get(TCAS.TYPE_NAME_ANNOTATION);
}
// assert(style != null);
AnnotationDisplayCustomizationFrame.this.fgColor = StyleConstants.getForeground(style);
AnnotationDisplayCustomizationFrame.this.fgIcon
- .setColor(AnnotationDisplayCustomizationFrame.this.fgColor);
+ .setColor(AnnotationDisplayCustomizationFrame.this.fgColor);
AnnotationDisplayCustomizationFrame.this.bgColor = StyleConstants.getBackground(style);
AnnotationDisplayCustomizationFrame.this.bgIcon
- .setColor(AnnotationDisplayCustomizationFrame.this.bgColor);
+ .setColor(AnnotationDisplayCustomizationFrame.this.bgColor);
setCurrentStyle(style);
setTextPane();
enableButtons(false);
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/FSNode.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/FSNode.java?view=diff&rev=480239&r1=480238&r2=480239
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/FSNode.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/FSNode.java Tue Nov 28 14:20:30 2006
@@ -130,7 +130,7 @@
}
ArrayList arrayNodes = new ArrayList(arrayLength);
if (nodeClass1 == INT_FS || nodeClass1 == FLOAT_FS || nodeClass1 == STRING_FS
- || nodeClass1 == STD_FS) {
+ || nodeClass1 == STD_FS) {
for (int i = 0; i < arrayLength; i++) {
node = new FSNode(this.fSTreeModel, nodeClass1, cas.getHeapValue(arrayPos), i);
arrayNodes.add(node);
@@ -139,14 +139,14 @@
} else if (nodeClass1 == BYTE_FS) {
for (int i = 0; i < arrayLength; i++) {
node = new FSNode(this.fSTreeModel, nodeClass1, cas.ll_getByteArrayValue((int) this.addr,
- i), i);
+ i), i);
arrayNodes.add(node);
++arrayPos;
}
} else if (nodeClass1 == SHORT_FS) {
for (int i = 0; i < arrayLength; i++) {
node = new FSNode(this.fSTreeModel, nodeClass1, cas.ll_getShortArrayValue(
- (int) this.addr, i), i);
+ (int) this.addr, i), i);
arrayNodes.add(node);
++arrayPos;
}
@@ -183,7 +183,7 @@
featAddr = cas.ll_getLongValue((int) featAddr);
}
FSNode childNode = new FSNode(this.fSTreeModel, this.fSTreeModel.getNodeType(
- (int) this.addr, feat1), featAddr, feat1);
+ (int) this.addr, feat1), featAddr, feat1);
this.children.add(childNode);
}
}
@@ -243,7 +243,7 @@
return getNullString();
}
return "<font color=blue>" + getType().getName() + "</font>["
- + cas.getArraySize((int) this.addr) + "]";
+ + cas.getArraySize((int) this.addr) + "]";
}
case STD_FS: {
if (cas.getHeapValue((int) this.addr) == 0) {
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/FSTreeModel.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/FSTreeModel.java?view=diff&rev=480239&r1=480238&r2=480239
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/FSTreeModel.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/FSTreeModel.java Tue Nov 28 14:20:30 2006
@@ -51,7 +51,7 @@
private ArrayList fss;
private static final String defaultRootString = "<html><b>" + MainFrame.htmlGrayColor
- + "FS List - no selection</b></html>";
+ + "FS List - no selection</b></html>";
private String rootString = defaultRootString;
@@ -69,7 +69,7 @@
this.cas = (TCASImpl) cas1;
final int size = index.size();
this.rootString = "<html><font color=green>" + indexName + "</font> - <font color=blue>"
- + index.getType().getName() + "</font> [" + size + "]</html>";
+ + index.getType().getName() + "</font> [" + size + "]</html>";
this.root = new FSNode(this, FSNode.DISPLAY_NODE, 0, null);
this.fss = new ArrayList();
FSIterator it = index.iterator();
@@ -142,7 +142,7 @@
} else if (this.cas.isAbstractArrayType(domType)) {
final int featAddr = this.cas.getFeatureValue(addr, ((FeatureImpl) feat).getCode());
if (this.cas.isArrayType(this.cas.getTypeSystemImpl()
- .getType(this.cas.getHeapValue(featAddr)))) {
+ .getType(this.cas.getHeapValue(featAddr)))) {
return FSNode.ARRAY_FS;
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/Gladis.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/Gladis.java?view=diff&rev=480239&r1=480238&r2=480239
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/Gladis.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/Gladis.java Tue Nov 28 14:20:30 2006
@@ -50,7 +50,7 @@
}
public static MainFrame createMainFrame() throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, UnsupportedLookAndFeelException {
+ IllegalAccessException, UnsupportedLookAndFeelException {
// Set look-and-feel.
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
final MainFrame frame = new MainFrame();
@@ -80,7 +80,7 @@
private static final void printUsage() {
System.out
- .println("Usage: java org.apache.uima.annot_view.Gladis [-text <TextFile>] [-desc <XmlDescriptor>] [-datapath <DataPath>] [-exec]");
+ .println("Usage: java org.apache.uima.annot_view.Gladis [-text <TextFile>] [-desc <XmlDescriptor>] [-datapath <DataPath>] [-exec]");
}
private static final boolean checkCmdLineSyntax(CommandLineParser clp) {
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/LogFileViewer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/LogFileViewer.java?view=diff&rev=480239&r1=480238&r2=480239
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/LogFileViewer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/LogFileViewer.java Tue Nov 28 14:20:30 2006
@@ -93,7 +93,7 @@
// Copy
Action copyAction = this.textArea.getActionMap().get(DefaultEditorKit.copyAction);
copyAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_C,
- InputEvent.CTRL_MASK));
+ InputEvent.CTRL_MASK));
copyAction.setEnabled(true);
this.scrollPane = new JScrollPane(this.textArea);
this.setContentPane(this.scrollPane);
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/MainFrame.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/MainFrame.java?view=diff&rev=480239&r1=480238&r2=480239
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/MainFrame.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/MainFrame.java Tue Nov 28 14:20:30 2006
@@ -352,7 +352,7 @@
private void maybeShowPopup(MouseEvent e) {
if (e.isPopupTrigger()) {
DefaultMutableTreeNode node = (DefaultMutableTreeNode) MainFrame.this.indexTree
- .getLastSelectedPathComponent();
+ .getLastSelectedPathComponent();
if (node == null) {
return;
}
@@ -456,7 +456,7 @@
public void valueChanged(TreeSelectionEvent arg0) {
// System.out.println("Tree selection value changed");
DefaultMutableTreeNode node = (DefaultMutableTreeNode) MainFrame.this.indexTree
- .getLastSelectedPathComponent();
+ .getLastSelectedPathComponent();
if (node == null) {
return;
}
@@ -479,7 +479,7 @@
MainFrame.this.index = MainFrame.this.cas.getIndexRepository().getIndex(label, type);
updateFSTree(label, MainFrame.this.index);
MainFrame.this.allAnnotViewerItem.setEnabled(((TCASImpl) MainFrame.this.cas)
- .isAnnotationType(type));
+ .isAnnotationType(type));
MainFrame.this.textArea.getCaret().setVisible(true);
}
@@ -550,7 +550,7 @@
MainFrame.this.undoMgr.discardAllEdits();
setFileStatusMessage();
setStatusbarMessage("Done loading text file " + MainFrame.this.textFile.getName() + " in "
- + time.getTimeSpan() + ".");
+ + time.getTimeSpan() + ".");
}
}
}
@@ -681,7 +681,7 @@
time.start();
SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
XCASDeserializer xcasDeserializer = new XCASDeserializer(MainFrame.this.cas
- .getTypeSystem());
+ .getTypeSystem());
MainFrame.this.cas.reset();
parser.parse(xcasFile, xcasDeserializer.getXCASHandler(MainFrame.this.cas));
time.stop();
@@ -693,7 +693,7 @@
MainFrame.this.sofaSelectionComboBox.addItem(CAS.NAME_DEFAULT_SOFA);
Iterator sofas = ((CASImpl) MainFrame.this.cas).getBaseCAS().getSofaIterator();
Feature sofaIdFeat = MainFrame.this.cas.getTypeSystem().getFeatureByFullName(
- CAS.FEATURE_FULL_NAME_SOFAID);
+ CAS.FEATURE_FULL_NAME_SOFAID);
boolean nonDefaultSofaFound = false;
while (sofas.hasNext()) {
SofaFS sofa = (SofaFS) sofas.next();
@@ -728,7 +728,7 @@
} else {
if (null != MainFrame.this.cas.getSofaDataArray()) {
text = "Sofa array with mime type = "
- + MainFrame.this.cas.getSofa().getSofaMime();
+ + MainFrame.this.cas.getSofa().getSofaMime();
}
}
}
@@ -784,7 +784,7 @@
MainFrame.this.ae = null;
}
MainFrame.this.cas = CasCreationUtils
- .createCas(tsDesc, null, new FsIndexDescription[0]);
+ .createCas(tsDesc, null, new FsIndexDescription[0]);
MainFrame.this.runOnCasMenuItem.setEnabled(false);
MainFrame.this.reRunMenu.setEnabled(false);
MainFrame.this.textArea.setText("");
@@ -1070,7 +1070,7 @@
internalRunAE(doCasReset);
timer.stop();
setStatusbarMessage("Done running AE " + this.ae.getAnalysisEngineMetaData().getName() + " in "
- + timer.getTimeSpan() + ".");
+ + timer.getTimeSpan() + ".");
updateIndexTree(true);
this.allAnnotViewerItem.setEnabled(false);
this.isDirty = false;
@@ -1139,8 +1139,7 @@
public void actionPerformed(ActionEvent arg0) {
String result = (String) JOptionPane.showInputDialog(MainFrame.this, "Specify the data path",
- "Set data path", JOptionPane.PLAIN_MESSAGE, null, null,
- MainFrame.this.dataPathName);
+ "Set data path", JOptionPane.PLAIN_MESSAGE, null, null, MainFrame.this.dataPathName);
if (result != null) {
MainFrame.this.setDataPath(result);
@@ -1229,7 +1228,7 @@
final String text = MainFrame.this.cas.getDocumentText();
System.out.println("Creating extents.");
AnnotationExtent[] extents = MultiMarkup.createAnnotationMarkups(it, text.length(),
- MainFrame.this.styleMap);
+ MainFrame.this.styleMap);
System.out.println("Initializing text frame.");
f.init(text, extents, getDimension(MainFrame.annotViewSizePref));
System.out.println("Done.");
@@ -1241,7 +1240,7 @@
public void actionPerformed(ActionEvent event) {
AnnotationDisplayCustomizationFrame acd = new AnnotationDisplayCustomizationFrame(
- "Customize Annotation Display");
+ "Customize Annotation Display");
acd.init(MainFrame.this.styleMap, MainFrame.this.cas);
acd.pack();
acd.show();
@@ -1284,15 +1283,15 @@
versionInfo = "Running Java " + javaVersion + " from " + javaVendor;
}
String msg = "CVD (CAS Visual Debugger)\n" + "Apache UIMA Version "
- + UIMAFramework.getVersionString() + "\n"
- + "Copyright 2006 The Apache Software Foundation\n" + versionInfo + "\n";
+ + UIMAFramework.getVersionString() + "\n"
+ + "Copyright 2006 The Apache Software Foundation\n" + versionInfo + "\n";
Icon icon = Images.getImageIcon(Images.MICROSCOPE);
if (icon == null) {
JOptionPane.showMessageDialog(MainFrame.this, msg, "About CVD",
- JOptionPane.INFORMATION_MESSAGE);
+ JOptionPane.INFORMATION_MESSAGE);
} else {
JOptionPane.showMessageDialog(MainFrame.this, msg, "About CVD",
- JOptionPane.INFORMATION_MESSAGE, icon);
+ JOptionPane.INFORMATION_MESSAGE, icon);
}
}
@@ -1375,9 +1374,9 @@
String manFileName = "/html_manual/casvisualdebugger.htm";
if (manFileName == null) {
String msg = "Can't find manual since system property\n"
- + "gladis.manual.file is not set.";
+ + "gladis.manual.file is not set.";
JOptionPane.showMessageDialog(MainFrame.this, msg, "Error loading manual",
- JOptionPane.ERROR_MESSAGE);
+ JOptionPane.ERROR_MESSAGE);
return;
}
JFrame manFrame = new JFrame("CVD Manual");
@@ -1402,8 +1401,8 @@
public void actionPerformed(ActionEvent event) {
String msg = "There is currently no online help."
- + "\nPlease find documentation on CVD and UIMA"
- + "\nin the doc directory of the UIMA installation";
+ + "\nPlease find documentation on CVD and UIMA"
+ + "\nin the doc directory of the UIMA installation";
JOptionPane.showMessageDialog(MainFrame.this, msg, "Help", JOptionPane.INFORMATION_MESSAGE);
}
@@ -1448,7 +1447,7 @@
private static final String indexReposRootLabel = "<html><b>CAS Index Repository</b></html>";
private static final String noIndexReposLabel = "<html><b>" + htmlGrayColor
- + "CAS Index Repository</b></html>";
+ + "CAS Index Repository</b></html>";
// private static final String noIndexReposLabel = indexReposRootLabel;
@@ -1752,7 +1751,7 @@
addRecentTextFile(this.textFile);
} else {
handleException(new IOException("File does not exist or is not readable: "
- + this.textFile.getAbsolutePath()));
+ + this.textFile.getAbsolutePath()));
}
// Add the loaded file to the recently used files list.
} catch (UnsupportedEncodingException e) {
@@ -1962,7 +1961,7 @@
this.cutAction.putValue(Action.NAME, "Cut");
this.cutAction.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_T));
this.cutAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_X,
- InputEvent.CTRL_MASK));
+ InputEvent.CTRL_MASK));
this.cutAction.setEnabled(false);
this.editMenu.add(this.cutAction);
// Copy
@@ -1970,7 +1969,7 @@
this.copyAction.putValue(Action.NAME, "Copy");
this.copyAction.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_C));
this.copyAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_C,
- InputEvent.CTRL_MASK));
+ InputEvent.CTRL_MASK));
this.copyAction.setEnabled(false);
this.editMenu.add(this.copyAction);
// Paste
@@ -1978,7 +1977,7 @@
pasteAction.putValue(Action.NAME, "Paste");
pasteAction.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_P));
pasteAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_V,
- InputEvent.CTRL_MASK));
+ InputEvent.CTRL_MASK));
this.editMenu.add(pasteAction);
}
@@ -2272,7 +2271,7 @@
this.reRunMenu.setEnabled(false);
this.runOnCasMenuItem = new JMenuItem("Run AE on CAS", KeyEvent.VK_Y);
this.runOnCasMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Y,
- ActionEvent.CTRL_MASK));
+ ActionEvent.CTRL_MASK));
runMenu.add(this.runOnCasMenuItem);
this.runOnCasMenuItem.addActionListener(new AnnotatorRunOnCasEventHandler());
this.runOnCasMenuItem.setEnabled(false);
@@ -2316,7 +2315,7 @@
MainFrame.this.logStream.flush();
}
LogFileViewer viewer = new LogFileViewer("Log file: "
- + MainFrame.this.logFile.getAbsolutePath());
+ + MainFrame.this.logFile.getAbsolutePath());
viewer.addWindowListener(new CloseLogViewHandler());
Dimension dim = getDimension(logViewSizePref);
if (dim == null) {
@@ -2335,14 +2334,14 @@
this.statusPanel.setLayout(new BoxLayout(this.statusPanel, BoxLayout.X_AXIS));
this.statusBar = new JTextField();
Border innerCompound = BorderFactory.createCompoundBorder(BorderFactory.createBevelBorder(
- BevelBorder.LOWERED, Color.lightGray, Color.darkGray), BorderFactory
- .createEmptyBorder(0, 3, 0, 3));
+ BevelBorder.LOWERED, Color.lightGray, Color.darkGray), BorderFactory.createEmptyBorder(
+ 0, 3, 0, 3));
Border leftCompoundBorder = BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(
- 0, 0, 0, 1), innerCompound);
+ 0, 0, 0, 1), innerCompound);
Border middleCompoundBorder = BorderFactory.createCompoundBorder(BorderFactory
- .createEmptyBorder(0, 1, 0, 1), innerCompound);
+ .createEmptyBorder(0, 1, 0, 1), innerCompound);
Border rightCompoundBorder = BorderFactory.createCompoundBorder(BorderFactory
- .createEmptyBorder(0, 1, 0, 0), innerCompound);
+ .createEmptyBorder(0, 1, 0, 0), innerCompound);
// statusBar.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 2));
this.statusBar.setBorder(leftCompoundBorder);
this.statusBar.setEditable(false);
@@ -2410,7 +2409,7 @@
// textBorder.setTitleJustification(TitledBorder.ABOVE_TOP);
} else {
textBorder = BorderFactory.createTitledBorder(this.textTitleBorder, this.textFile
- .getAbsolutePath());
+ .getAbsolutePath());
}
this.textScrollPane.setBorder(textBorder);
this.textScrollPane.revalidate();
@@ -2423,7 +2422,7 @@
} else {
this.aeStatus.setText(this.aeDescriptorFile.getName());
this.aeStatus.setToolTipText("<html>Currently loaded AE descriptor file:<br>"
- + this.aeDescriptorFile.getAbsolutePath() + "</html>");
+ + this.aeDescriptorFile.getAbsolutePath() + "</html>");
}
this.statusPanel.revalidate();
}
@@ -2504,7 +2503,7 @@
this.sofaSelectionPanel.setVisible(false);
this.sofaSelectionComboBox.addItemListener(new SofaSelectionListener());
this.sofaSelectionComboBox
- .setToolTipText("This CAS has multiple Views. Select the View to display.");
+ .setToolTipText("This CAS has multiple Views. Select the View to display.");
JSplitPane treePairPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
treePairPane.setDividerSize(dividerSize);
@@ -2554,13 +2553,13 @@
int max = (numFiles < maxRecentSize) ? numFiles : maxRecentSize;
for (int i = 0; i < max; i++) {
this.recentTextFileMenu.add(createRecentTextFileItem(i + 1, new File(
- (String) this.textFileNameList.get(i))));
+ (String) this.textFileNameList.get(i))));
}
numFiles = this.descFileNameList.size();
max = (numFiles < maxRecentSize) ? numFiles : maxRecentSize;
for (int i = 0; i < max; i++) {
this.recentDescFileMenu.add(createRecentDescFileItem(i + 1, new File(
- (String) this.descFileNameList.get(i))));
+ (String) this.descFileNameList.get(i))));
}
}
@@ -2583,7 +2582,7 @@
this.log = UIMAFramework.getLogger();
this.logStream = new EncodedPrintStream(new BufferedOutputStream(new FileOutputStream(
- this.logFile)), "UTF-8");
+ this.logFile)), "UTF-8");
this.log.setOutputStream(this.logStream);
// System.out.println("Logging to: " + logFile.getAbsolutePath());
@@ -2655,7 +2654,7 @@
this.sofaSelectionComboBox.addItem(CAS.NAME_DEFAULT_SOFA);
Iterator sofas = ((CASImpl) MainFrame.this.cas).getBaseCAS().getSofaIterator();
Feature sofaIdFeat = MainFrame.this.cas.getTypeSystem().getFeatureByFullName(
- CAS.FEATURE_FULL_NAME_SOFAID);
+ CAS.FEATURE_FULL_NAME_SOFAID);
boolean nonDefaultSofaFound = false;
while (sofas.hasNext()) {
SofaFS sofa = (SofaFS) sofas.next();
@@ -2678,7 +2677,7 @@
private void setLanguage() {
if (this.language != null) {
Feature langFeat = this.cas.getTypeSystem().getFeatureByFullName(
- TCAS.FEATURE_FULL_NAME_LANGUAGE);
+ TCAS.FEATURE_FULL_NAME_LANGUAGE);
AnnotationFS doc = this.cas.getDocumentAnnotation();
if (doc != null) {
doc.setStringValue(langFeat, this.language);
@@ -2754,7 +2753,7 @@
DefaultTreeModel model = (DefaultTreeModel) this.indexTree.getModel();
// 1.3 workaround
TreeModelListener[] listeners = org.apache.uima.tools.annot_view.ts_editor.MainFrame
- .getTreeModelListeners(model);
+ .getTreeModelListeners(model);
// TreeModelListener[] listeners = model.getTreeModelListeners();
// System.out.println("Number of tree model listeners: " +
// listeners.length);
@@ -2788,7 +2787,7 @@
}
private DefaultMutableTreeNode createTypeTree(Type type, TypeSystem ts, String label,
- FSIndexRepository ir) {
+ FSIndexRepository ir) {
int size = ir.getIndex(label, type).size();
TypeTreeNode typeNode = new TypeTreeNode(type, label, size);
DefaultMutableTreeNode node = new DefaultMutableTreeNode(typeNode);
@@ -3034,27 +3033,25 @@
Action focusIRAction = new FocusIRAction();
String focusIRActionName = "focusIRAction";
getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
- KeyStroke.getKeyStroke(KeyEvent.VK_I, InputEvent.CTRL_MASK), focusIRActionName);
+ KeyStroke.getKeyStroke(KeyEvent.VK_I, InputEvent.CTRL_MASK), focusIRActionName);
getRootPane().getActionMap().put(focusIRActionName, focusIRAction);
// Create a key map for focussing the FS tree panel.
Action focusFSAction = new FocusFSAction();
String focusFSActionName = "focusFSAction";
getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
- KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_MASK), focusFSActionName);
+ KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_MASK), focusFSActionName);
getRootPane().getActionMap().put(focusFSActionName, focusFSAction);
// Create a key map for focussing the text area.
Action focusTextAction = new FocusTextAction();
String focusTextActionName = "focusTextAction";
getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
- KeyStroke.getKeyStroke(KeyEvent.VK_T, InputEvent.CTRL_MASK),
- focusTextActionName);
+ KeyStroke.getKeyStroke(KeyEvent.VK_T, InputEvent.CTRL_MASK), focusTextActionName);
getRootPane().getActionMap().put(focusTextActionName, focusTextAction);
// Create a key map for bringing up the text area context menu.
Action textContextAction = new TextContextMenuAction();
String textContextActionName = "textContextAction";
this.textArea.getInputMap(JComponent.WHEN_FOCUSED).put(
- KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.ALT_MASK),
- textContextActionName);
+ KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.ALT_MASK), textContextActionName);
this.textArea.getActionMap().put(textContextActionName, textContextAction);
}
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/MultiMarkup.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/MultiMarkup.java?view=diff&rev=480239&r1=480238&r2=480239
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/MultiMarkup.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/MultiMarkup.java Tue Nov 28 14:20:30 2006
@@ -64,7 +64,7 @@
}
public static AnnotationExtent[] createAnnotationMarkups(FSIterator it, int textLen,
- HashMap styleMap) {
+ HashMap styleMap) {
ArrayList list = new ArrayList();
list.add(new AnnotExtent(0, textLen, 0, null));
AnnotationFS fs;
@@ -87,8 +87,7 @@
if (ext.start < fs.getBegin()) {
++pos;
list.add(pos,
- new AnnotExtent(fs.getBegin(), ext.end, ext.depth + 1, fs.getType()
- .getName()));
+ new AnnotExtent(fs.getBegin(), ext.end, ext.depth + 1, fs.getType().getName()));
ext.end = fs.getBegin();
ext = (AnnotExtent) list.get(pos);
} else {
@@ -132,7 +131,7 @@
}
Style unmarkedStyle = StyleContext.getDefaultStyleContext()
- .getStyle(StyleContext.DEFAULT_STYLE);
+ .getStyle(StyleContext.DEFAULT_STYLE);
Style annotStyle = (Style) styleMap.get(TCAS.TYPE_NAME_ANNOTATION);
// Copy our internal extents to the public representation.
final int size = list.size();
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/ts_editor/MainFrame.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/ts_editor/MainFrame.java?view=diff&rev=480239&r1=480238&r2=480239
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/ts_editor/MainFrame.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/ts_editor/MainFrame.java Tue Nov 28 14:20:30 2006
@@ -65,7 +65,7 @@
public void valueChanged(TreeSelectionEvent event) {
// System.out.println("");
DefaultMutableTreeNode node = (DefaultMutableTreeNode) MainFrame.this.typeTree
- .getLastSelectedPathComponent();
+ .getLastSelectedPathComponent();
if (node == null) {
return;
}
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/AnalysisEnginePanel.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/AnalysisEnginePanel.java?view=diff&rev=480239&r1=480238&r2=480239
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/AnalysisEnginePanel.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/AnalysisEnginePanel.java Tue Nov 28 14:20:30 2006
@@ -62,13 +62,13 @@
public boolean hasFileChanged(long lastCheck) {
return specifierFile.lastModified() > this.lastFileSyncTimestamp
- && specifierFile.lastModified() > lastCheck;
+ && specifierFile.lastModified() > lastCheck;
}
public void refreshFromFile() throws InvalidXMLException, IOException {
clearAll();
this.aeSpecifier = UIMAFramework.getXMLParser().parseResourceSpecifier(
- new XMLInputSource(this.specifierFile));
+ new XMLInputSource(this.specifierFile));
if (aeSpecifier instanceof AnalysisEngineDescription) {
AnalysisEngineDescription aeDescription = (AnalysisEngineDescription) aeSpecifier;
populate(aeDescription.getMetaData(), null);
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/ConsumerPanel.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/ConsumerPanel.java?view=diff&rev=480239&r1=480238&r2=480239
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/ConsumerPanel.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/ConsumerPanel.java Tue Nov 28 14:20:30 2006
@@ -59,13 +59,13 @@
public boolean hasFileChanged(long lastCheck) {
return specifierFile.lastModified() > this.lastFileSyncTimestamp
- && specifierFile.lastModified() > lastCheck;
+ && specifierFile.lastModified() > lastCheck;
}
public void refreshFromFile() throws InvalidXMLException, IOException {
clearAll();
this.casConsumerSpecifier = UIMAFramework.getXMLParser().parseResourceSpecifier(
- new XMLInputSource(this.specifierFile));
+ new XMLInputSource(this.specifierFile));
if (casConsumerSpecifier instanceof CasConsumerDescription) {
CasConsumerDescription consumerDescription = (CasConsumerDescription) casConsumerSpecifier;
populate(consumerDescription.getMetaData(), null);
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmFrame.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmFrame.java?view=diff&rev=480239&r1=480238&r2=480239
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmFrame.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmFrame.java Tue Nov 28 14:20:30 2006
@@ -136,7 +136,7 @@
aboutDialog.setVisible(true);
} else if (source == helpMenuItem) {
JOptionPane.showMessageDialog(CpmFrame.this, CpmPanel.HELP_MESSAGE,
- "Collection Processing Engine Configurator Help", JOptionPane.PLAIN_MESSAGE);
+ "Collection Processing Engine Configurator Help", JOptionPane.PLAIN_MESSAGE);
} else if (source == exitMenuItem) {
this.processWindowEvent(new WindowEvent(this, WindowEvent.WINDOW_CLOSING));
}