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:25:57 UTC
svn commit: r480252 [8/16] - in /incubator/uima/uimaj/trunk/uimaj-core/src:
main/java/org/apache/uima/ main/java/org/apache/uima/analysis_component/
main/java/org/apache/uima/analysis_engine/
main/java/org/apache/uima/analysis_engine/annotator/ main/ja...
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList.java Tue Nov 28 14:25:39 2006
@@ -49,19 +49,19 @@
/** getter for head * */
public String getHead() {
if (NonEmptyStringList_Type.featOkTst
- && ((NonEmptyStringList_Type) jcasType).casFeat_head == null)
+ && ((NonEmptyStringList_Type) jcasType).casFeat_head == null)
JCas.throwFeatMissing("head", "uima.cas.NonEmptyStringList");
return jcasType.ll_cas.ll_getStringValue(addr,
- ((NonEmptyStringList_Type) jcasType).casFeatCode_head);
+ ((NonEmptyStringList_Type) jcasType).casFeatCode_head);
}
/** setter for head * */
public void setHead(String v) {
if (NonEmptyStringList_Type.featOkTst
- && ((NonEmptyStringList_Type) jcasType).casFeat_head == null)
+ && ((NonEmptyStringList_Type) jcasType).casFeat_head == null)
JCas.throwFeatMissing("head", "uima.cas.NonEmptyStringList");
jcasType.ll_cas.ll_setStringValue(addr, ((NonEmptyStringList_Type) jcasType).casFeatCode_head,
- v);
+ v);
}
// *------------------*
@@ -69,18 +69,18 @@
/** getter for tail * */
public StringList getTail() {
if (NonEmptyStringList_Type.featOkTst
- && ((NonEmptyStringList_Type) jcasType).casFeat_tail == null)
+ && ((NonEmptyStringList_Type) jcasType).casFeat_tail == null)
JCas.throwFeatMissing("tail", "uima.cas.NonEmptyStringList");
return (StringList) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
- ((NonEmptyStringList_Type) jcasType).casFeatCode_tail)));
+ ((NonEmptyStringList_Type) jcasType).casFeatCode_tail)));
}
/** setter for tail * */
public void setTail(StringList v) {
if (NonEmptyStringList_Type.featOkTst
- && ((NonEmptyStringList_Type) jcasType).casFeat_tail == null)
+ && ((NonEmptyStringList_Type) jcasType).casFeat_tail == null)
JCas.throwFeatMissing("tail", "uima.cas.NonEmptyStringList");
jcasType.ll_cas.ll_setRefValue(addr, ((NonEmptyStringList_Type) jcasType).casFeatCode_tail,
- jcasType.ll_cas.ll_getFSRef(v));
+ jcasType.ll_cas.ll_getFSRef(v));
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList_Type.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList_Type.java Tue Nov 28 14:25:39 2006
@@ -92,10 +92,10 @@
casFeat_head = jcas.getRequiredFeatureDE(casType, "head", "uima.cas.String", featOkTst);
casFeatCode_head = (null == casFeat_head) ? JCas.INVALID_FEATURE_CODE
- : ((FeatureImpl) casFeat_head).getCode();
+ : ((FeatureImpl) casFeat_head).getCode();
casFeat_tail = jcas.getRequiredFeatureDE(casType, "tail", "uima.cas.StringList", featOkTst);
casFeatCode_tail = (null == casFeat_tail) ? JCas.INVALID_FEATURE_CODE
- : ((FeatureImpl) casFeat_tail).getCode();
+ : ((FeatureImpl) casFeat_tail).getCode();
}
protected NonEmptyStringList_Type() { // block default new operator
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java Tue Nov 28 14:25:39 2006
@@ -114,7 +114,7 @@
jcasType.casImpl.checkArrayBounds(addr, srcOffset, length);
for (int i = 0; i < length; i++) {
dest[i + destOffset] = Short.toString(jcasType.ll_cas.ll_getShortArrayValue(addr, i
- + srcOffset));
+ + srcOffset));
}
}
@@ -125,7 +125,7 @@
jcasType.casImpl.checkArrayBounds(addr, destOffset, length);
for (int i = 0; i < length; i++) {
jcasType.ll_cas.ll_setShortArrayValue(addr, i + destOffset, Short.parseShort(src[i
- + srcOffset]));
+ + srcOffset]));
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa.java Tue Nov 28 14:25:39 2006
@@ -141,7 +141,7 @@
*/
public void setLocalSofaData(FeatureStructure aFS) {
final Feature arrayFeat = jcasType.casImpl.getTypeSystem().getFeatureByFullName(
- CAS.FEATURE_FULL_NAME_SOFAARRAY);
+ CAS.FEATURE_FULL_NAME_SOFAARRAY);
if (isSofaDataSet()) {
CASRuntimeException e = new CASRuntimeException(CASRuntimeException.SOFADATA_ALREADY_SET);
e.addArgument("SetLocalSofaData()");
@@ -156,7 +156,7 @@
*/
public void setLocalSofaData(String aString) {
final Feature stringFeat = jcasType.casImpl.getTypeSystem().getFeatureByFullName(
- CAS.FEATURE_FULL_NAME_SOFASTRING);
+ CAS.FEATURE_FULL_NAME_SOFASTRING);
if (isSofaDataSet()) {
CASRuntimeException e = new CASRuntimeException(CASRuntimeException.SOFADATA_ALREADY_SET);
e.addArgument("SetLocalSofaData()");
@@ -174,7 +174,7 @@
*/
public FeatureStructure getLocalFSData() {
final Feature arrayFeat = jcasType.casImpl.getTypeSystem().getFeatureByFullName(
- CAS.FEATURE_FULL_NAME_SOFAARRAY);
+ CAS.FEATURE_FULL_NAME_SOFAARRAY);
return this.getFeatureValue(arrayFeat);
}
@@ -184,7 +184,7 @@
*/
public String getLocalStringData() {
final Feature stringFeat = jcasType.casImpl.getTypeSystem().getFeatureByFullName(
- CAS.FEATURE_FULL_NAME_SOFASTRING);
+ CAS.FEATURE_FULL_NAME_SOFASTRING);
return this.getStringValue(stringFeat);
}
@@ -194,7 +194,7 @@
*/
public void setRemoteSofaURI(String aURI) {
final Feature uriFeat = jcasType.casImpl.getTypeSystem().getFeatureByFullName(
- CAS.FEATURE_FULL_NAME_SOFAURI);
+ CAS.FEATURE_FULL_NAME_SOFAURI);
if (isSofaDataSet()) {
CASRuntimeException e = new CASRuntimeException(CASRuntimeException.SOFADATA_ALREADY_SET);
e.addArgument("setRemoteSofaURI()");
@@ -205,14 +205,14 @@
private boolean isSofaDataSet() {
final Feature uriFeat = jcasType.casImpl.getTypeSystem().getFeatureByFullName(
- CAS.FEATURE_FULL_NAME_SOFAURI);
+ CAS.FEATURE_FULL_NAME_SOFAURI);
final Feature arrayFeat = jcasType.casImpl.getTypeSystem().getFeatureByFullName(
- CAS.FEATURE_FULL_NAME_SOFAARRAY);
+ CAS.FEATURE_FULL_NAME_SOFAARRAY);
final Feature stringFeat = jcasType.casImpl.getTypeSystem().getFeatureByFullName(
- CAS.FEATURE_FULL_NAME_SOFASTRING);
+ CAS.FEATURE_FULL_NAME_SOFASTRING);
if (null != this.getStringValue(uriFeat) || null != this.getFeatureValue(arrayFeat)
- || null != this.getStringValue(stringFeat)) {
+ || null != this.getStringValue(stringFeat)) {
return true;
}
return false;
@@ -235,25 +235,25 @@
// This method is duplicated in SofaFSImpl. Any changes should be made in both places.
public String getSofaMime() {
final Feature mimeFeat = jcasType.casImpl.getTypeSystem().getFeatureByFullName(
- CAS.FEATURE_FULL_NAME_SOFAMIME);
+ CAS.FEATURE_FULL_NAME_SOFAMIME);
return jcasType.casImpl.getLowLevelCAS().ll_getStringValue(super.addr,
- ((FeatureImpl) mimeFeat).getCode());
+ ((FeatureImpl) mimeFeat).getCode());
}
// This method is duplicated in SofaFSImpl. Any changes should be made in both places.
public String getSofaURI() {
final Feature uriFeat = jcasType.casImpl.getTypeSystem().getFeatureByFullName(
- CAS.FEATURE_FULL_NAME_SOFAURI);
+ CAS.FEATURE_FULL_NAME_SOFAURI);
return jcasType.casImpl.getLowLevelCAS().ll_getStringValue(super.addr,
- ((FeatureImpl) uriFeat).getCode());
+ ((FeatureImpl) uriFeat).getCode());
}
// This method is duplicated in SofaFSImpl. Any changes should be made in both places.
public int getSofaRef() {
final Feature numFeat = jcasType.casImpl.getTypeSystem().getFeatureByFullName(
- CAS.FEATURE_FULL_NAME_SOFANUM);
+ CAS.FEATURE_FULL_NAME_SOFANUM);
return jcasType.casImpl.getLowLevelCAS().ll_getIntValue(super.addr,
- ((FeatureImpl) numFeat).getCode());
+ ((FeatureImpl) numFeat).getCode());
}
public InputStream getSofaDataStream() {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa_Type.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa_Type.java Tue Nov 28 14:25:39 2006
@@ -94,15 +94,15 @@
casFeat_sofaNum = jcas.getRequiredFeatureDE(casType, "sofaNum", "uima.cas.Integer", featOkTst);
casFeatCode_sofaNum = (null == casFeat_sofaNum) ? JCas.INVALID_FEATURE_CODE
- : ((FeatureImpl) casFeat_sofaNum).getCode();
+ : ((FeatureImpl) casFeat_sofaNum).getCode();
casFeat_sofaID = jcas.getRequiredFeatureDE(casType, "sofaID", "uima.cas.String", featOkTst);
casFeatCode_sofaID = (null == casFeat_sofaID) ? JCas.INVALID_FEATURE_CODE
- : ((FeatureImpl) casFeat_sofaID).getCode();
+ : ((FeatureImpl) casFeat_sofaID).getCode();
casFeat_mimeType = jcas.getRequiredFeatureDE(casType, "mimeType", "uima.cas.String", featOkTst);
casFeatCode_mimeType = (null == casFeat_mimeType) ? JCas.INVALID_FEATURE_CODE
- : ((FeatureImpl) casFeat_mimeType).getCode();
+ : ((FeatureImpl) casFeat_mimeType).getCode();
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray.java Tue Nov 28 14:25:39 2006
@@ -55,7 +55,7 @@
public StringArray(JCas jcas, int length) {
this(
/* addr */jcas.getLowLevelCas().ll_createArray(jcas.getType(typeIndexID).casTypeCode, length,
- true),
+ true),
/* type */jcas.getType(typeIndexID));
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList.java Tue Nov 28 14:25:39 2006
@@ -48,14 +48,14 @@
public String getNthElement(int i) {
if (this instanceof EmptyStringList) {
CASRuntimeException casEx = new CASRuntimeException(
- CASRuntimeException.JCAS_GET_NTH_ON_EMPTY_LIST);
+ CASRuntimeException.JCAS_GET_NTH_ON_EMPTY_LIST);
casEx.addArgument("EmptyStringList");
throw casEx;
}
if (i < 0) {
CASRuntimeException casEx = new CASRuntimeException(
- CASRuntimeException.JCAS_GET_NTH_NEGATIVE_INDEX);
+ CASRuntimeException.JCAS_GET_NTH_NEGATIVE_INDEX);
casEx.addArgument(new Integer(i).toString());
throw casEx;
}
@@ -65,7 +65,7 @@
for (;; i--) {
if (cg instanceof EmptyStringList) {
CASRuntimeException casEx = new CASRuntimeException(
- CASRuntimeException.JCAS_GET_NTH_PAST_END);
+ CASRuntimeException.JCAS_GET_NTH_PAST_END);
casEx.addArgument(new Integer(originali).toString());
throw casEx;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java Tue Nov 28 14:25:39 2006
@@ -168,7 +168,7 @@
if (installGenerator) {
((CASImpl) ll_cas).getFSClassRegistry().addGeneratorForType((TypeImpl) this.casType,
- getFSGenerator());
+ getFSGenerator());
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCas.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCas.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCas.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCas.java Tue Nov 28 14:25:39 2006
@@ -281,13 +281,13 @@
if (this.casImpl.getTypeSystem().getType(typeName) == null) {
// no - report error that JCAS type was not defined in XML descriptor
CASRuntimeException casEx = new CASRuntimeException(
- CASRuntimeException.JCAS_TYPE_NOT_IN_CAS);
+ CASRuntimeException.JCAS_TYPE_NOT_IN_CAS);
casEx.addArgument(typeName);
throw casEx;
} else {
// yes - there was some problem loading the _Type object
CASRuntimeException casEx = new CASRuntimeException(
- CASRuntimeException.JCAS_MISSING_COVERCLASS);
+ CASRuntimeException.JCAS_MISSING_COVERCLASS);
casEx.addArgument(typeName + "_Type");
throw casEx;
}
@@ -411,7 +411,7 @@
String nameBase = "org.apache.uima.jcas." + casName.substring(5);
name_Type = nameBase + "_Type";
jcasTypes.put(nameBase, new LoadedJCasType(t, Class.forName(name_Type, true, cas
- .getJCasClassLoader())));
+ .getJCasClassLoader())));
} catch (ClassNotFoundException e1) {
// never get here because built-ins have java cover types
e1.printStackTrace();
@@ -422,7 +422,7 @@
try {
name_Type = casName + "_Type";
jcasTypes.put(casName, new LoadedJCasType(t, Class.forName(name_Type, true, cas
- .getJCasClassLoader())));
+ .getJCasClassLoader())));
// also force the load the plain name without _Type for old-style - that's where
// the index is incremented
Class.forName(casName, true, cas.getJCasClassLoader());
@@ -566,7 +566,7 @@
// old version has the index in the base type
String name = clas.getName();
Class clas2 = Class.forName(name.substring(0, name.length() - 5), true, cas
- .getJCasClassLoader()); // drop _Type
+ .getJCasClassLoader()); // drop _Type
typeIndexField = clas2.getDeclaredField("typeIndexID");
} catch (NoSuchFieldException e2) {
logAndThrow(e2);
@@ -755,7 +755,7 @@
if (casImpl instanceof TCAS)
return (Sofa) ((TCAS) casImpl).getSofa();
CASRuntimeException casEx = new CASRuntimeException(
- CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
+ CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
casEx.addArgument("getSofa()");
throw casEx;
}
@@ -798,7 +798,7 @@
if (casImpl instanceof TCAS)
return (DocumentAnnotation) ((TCAS) casImpl).getDocumentAnnotation();
CASRuntimeException casEx = new CASRuntimeException(
- CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
+ CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
casEx.addArgument("getDocumentAnnotation()");
throw casEx;
}
@@ -819,7 +819,7 @@
if (casImpl instanceof TCAS)
return (TOP) ((TCAS) casImpl).getDocumentAnnotation();
CASRuntimeException casEx = new CASRuntimeException(
- CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
+ CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
casEx.addArgument("getDocumentAnnotationFs()");
throw casEx;
}
@@ -833,7 +833,7 @@
if (casImpl instanceof TCAS)
return ((TCAS) casImpl).getDocumentText();
CASRuntimeException casEx = new CASRuntimeException(
- CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
+ CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
casEx.addArgument("getDocumentText()");
throw casEx;
}
@@ -847,7 +847,7 @@
if (casImpl instanceof TCAS)
return (FSArray) ((TCAS) casImpl).getSofaDataArray();
CASRuntimeException casEx = new CASRuntimeException(
- CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
+ CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
casEx.addArgument("getSofaDataArray()");
throw casEx;
}
@@ -861,7 +861,7 @@
if (casImpl instanceof TCAS)
return ((TCAS) casImpl).getSofaDataURI();
CASRuntimeException casEx = new CASRuntimeException(
- CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
+ CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
casEx.addArgument("getSofaDataURI()");
throw casEx;
}
@@ -875,7 +875,7 @@
((TCAS) casImpl).setDocumentText(text);
else {
CASRuntimeException casEx = new CASRuntimeException(
- CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
+ CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
casEx.addArgument("setDocumentText(...)");
throw casEx;
}
@@ -890,7 +890,7 @@
((TCAS) casImpl).setSofaDataString(text, mime);
else {
CASRuntimeException casEx = new CASRuntimeException(
- CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
+ CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
casEx.addArgument("setSofaDataString(...)");
throw casEx;
}
@@ -905,7 +905,7 @@
((TCAS) casImpl).setSofaDataArray(array, mime);
else {
CASRuntimeException casEx = new CASRuntimeException(
- CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
+ CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
casEx.addArgument("setSofaDataArray(...)");
throw casEx;
}
@@ -920,7 +920,7 @@
((TCAS) casImpl).setSofaDataURI(uri, mime);
else {
CASRuntimeException casEx = new CASRuntimeException(
- CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
+ CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
casEx.addArgument("setSofaDataURI(...)");
throw casEx;
}
@@ -935,7 +935,7 @@
if (casImpl instanceof TCAS)
return ((TCAS) casImpl).getDocumentLanguage();
CASRuntimeException casEx = new CASRuntimeException(
- CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
+ CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
casEx.addArgument("getDocumentLanguage()");
throw casEx;
}
@@ -949,7 +949,7 @@
((TCAS) casImpl).setDocumentLanguage(language);
else {
CASRuntimeException casEx = new CASRuntimeException(
- CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
+ CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
casEx.addArgument("setDocumentLanguage(" + language + ")");
throw casEx;
}
@@ -964,7 +964,7 @@
if (casImpl instanceof TCAS)
return ((TCAS) casImpl).getSofaDataStream();
CASRuntimeException casEx = new CASRuntimeException(
- CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
+ CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
casEx.addArgument("getSofaDataArray()");
throw casEx;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JFSIndexRepositoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JFSIndexRepositoryImpl.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JFSIndexRepositoryImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JFSIndexRepositoryImpl.java Tue Nov 28 14:25:39 2006
@@ -71,7 +71,7 @@
if (aCas instanceof TCAS)
return ((TCAS) aCas).getAnnotationIndex();
CASRuntimeException casEx = new CASRuntimeException(
- CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
+ CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
casEx.addArgument("JFSIndexRepostory: getAnnotationIndex()");
throw casEx;
}
@@ -86,7 +86,7 @@
if (aCas instanceof TCAS)
return ((TCAS) aCas).getAnnotationIndex(jcas.getCasType(type));
CASRuntimeException casEx = new CASRuntimeException(
- CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
+ CASRuntimeException.JCAS_UNSUPPORTED_OP_NOT_TCAS);
casEx.addArgument("JFSIndexRepostory: getAnnotationIndex(type)");
throw casEx;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation_Type.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation_Type.java Tue Nov 28 14:25:39 2006
@@ -94,7 +94,6 @@
// if (text == null) return null;
// return text.substring(getBegin(inst), getEnd(inst));
// }
-
// * initialize variables to correspond with Cas Type and Features
public Annotation_Type(JCas jcas, Type casType) {
super(jcas, casType);
@@ -102,10 +101,10 @@
casFeat_begin = jcas.getRequiredFeatureDE(casType, "begin", "uima.cas.Integer", featOkTst);
casFeatCode_begin = (null == casFeat_begin) ? JCas.INVALID_FEATURE_CODE
- : ((FeatureImpl) casFeat_begin).getCode();
+ : ((FeatureImpl) casFeat_begin).getCode();
casFeat_end = jcas.getRequiredFeatureDE(casType, "end", "uima.cas.Integer", featOkTst);
casFeatCode_end = (null == casFeat_end) ? JCas.INVALID_FEATURE_CODE
- : ((FeatureImpl) casFeat_end).getCode();
+ : ((FeatureImpl) casFeat_end).getCode();
}
protected Annotation_Type() { // block default new operator
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation.java Tue Nov 28 14:25:39 2006
@@ -59,10 +59,10 @@
*/
public String getLanguage() {
if (DocumentAnnotation_Type.featOkTst
- && ((DocumentAnnotation_Type) jcasType).casFeat_language == null)
+ && ((DocumentAnnotation_Type) jcasType).casFeat_language == null)
JCas.throwFeatMissing("language", "uima.tcas.DocumentAnnotation");
return jcasType.ll_cas.ll_getStringValue(addr,
- ((DocumentAnnotation_Type) jcasType).casFeatCode_language);
+ ((DocumentAnnotation_Type) jcasType).casFeatCode_language);
}
/**
@@ -70,9 +70,9 @@
*/
public void setLanguage(String v) {
if (DocumentAnnotation_Type.featOkTst
- && ((DocumentAnnotation_Type) jcasType).casFeat_language == null)
+ && ((DocumentAnnotation_Type) jcasType).casFeat_language == null)
JCas.throwFeatMissing("language", "uima.tcas.DocumentAnnotation");
jcasType.ll_cas.ll_setStringValue(addr,
- ((DocumentAnnotation_Type) jcasType).casFeatCode_language, v);
+ ((DocumentAnnotation_Type) jcasType).casFeatCode_language, v);
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation_Type.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation_Type.java Tue Nov 28 14:25:39 2006
@@ -76,7 +76,7 @@
casFeat_language = jcas.getRequiredFeatureDE(casType, "language", "uima.cas.String", featOkTst);
casFeatCode_language = (null == casFeat_language) ? JCas.INVALID_FEATURE_CODE
- : ((FeatureImpl) casFeat_language).getCode();
+ : ((FeatureImpl) casFeat_language).getCode();
}
protected DocumentAnnotation_Type() { // block default new operator
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java Tue Nov 28 14:25:39 2006
@@ -310,7 +310,7 @@
* If any I/O exception occurred.
*/
protected static StringBuffer addListOfJarFiles(File libDir, StringBuffer listBuffer)
- throws IOException {
+ throws IOException {
// create list of JAR files in a given directory
if (libDir.isDirectory()) {
Collection fileList = FileUtil.createFileList(libDir);
@@ -341,7 +341,7 @@
* otherwise.
*/
protected static boolean addToSystemEnvTable(Properties sysEnvTable, String localKey,
- String localValue) {
+ String localValue) {
boolean done = false;
Enumeration sysKeys = sysEnvTable.keys();
while (sysKeys.hasMoreElements() && !done) {
@@ -412,18 +412,18 @@
* If any I/O exception occurred.
*/
public static String buildComponentClassPath(String compRootDirPath,
- InstallationDescriptor insdObject) throws IOException {
+ InstallationDescriptor insdObject) throws IOException {
// create list of JAR files in lib dir.
File compLibDir = new File(compRootDirPath + "/" + PACKAGE_LIB_DIR);
StringBuffer cpBuffer = new StringBuffer();
cpBuffer = addListOfJarFiles(compLibDir, cpBuffer);
// append all specified CLASSPATH env.var. settings
Iterator envActions = insdObject.getInstallationActions(
- InstallationDescriptor.ActionInfo.SET_ENV_VARIABLE_ACT).iterator();
+ InstallationDescriptor.ActionInfo.SET_ENV_VARIABLE_ACT).iterator();
while (envActions.hasNext()) {
// if env.var.name is CLASSPATH, append value to the buffer
InstallationDescriptor.ActionInfo actInfo = (InstallationDescriptor.ActionInfo) envActions
- .next();
+ .next();
if (actInfo.params != null) {
String varName = actInfo.params.getProperty(InstallationDescriptorHandler.VAR_NAME_TAG);
String varValue = actInfo.params.getProperty(InstallationDescriptorHandler.VAR_VALUE_TAG);
@@ -456,11 +456,11 @@
}
// append all specified PATH env.var. settings
Iterator envActions = insdObject.getInstallationActions(
- InstallationDescriptor.ActionInfo.SET_ENV_VARIABLE_ACT).iterator();
+ InstallationDescriptor.ActionInfo.SET_ENV_VARIABLE_ACT).iterator();
while (envActions.hasNext()) {
// if env.var.name is PATH, append value to the buffer
InstallationDescriptor.ActionInfo actInfo = (InstallationDescriptor.ActionInfo) envActions
- .next();
+ .next();
if (actInfo.params != null) {
String varName = actInfo.params.getProperty(InstallationDescriptorHandler.VAR_NAME_TAG);
String varValue = actInfo.params.getProperty(InstallationDescriptorHandler.VAR_VALUE_TAG);
@@ -534,16 +534,16 @@
Properties envVarsTable = new Properties();
// find all 'set_env_variable' actions
Iterator envActions = insdObject.getInstallationActions(
- InstallationDescriptor.ActionInfo.SET_ENV_VARIABLE_ACT).iterator();
+ InstallationDescriptor.ActionInfo.SET_ENV_VARIABLE_ACT).iterator();
while (envActions.hasNext()) {
// add env.var. settings to the table
InstallationDescriptor.ActionInfo actInfo = (InstallationDescriptor.ActionInfo) envActions
- .next();
+ .next();
String varName = actInfo.params.getProperty(InstallationDescriptorHandler.VAR_NAME_TAG);
String varValue = actInfo.params.getProperty(InstallationDescriptorHandler.VAR_VALUE_TAG);
// exclude CLASSPATH and PATH
if (varName != null && varValue != null && !varName.equalsIgnoreCase(CLASSPATH_VAR)
- && !varName.equalsIgnoreCase(PATH_VAR)) {
+ && !varName.equalsIgnoreCase(PATH_VAR)) {
// check if the same name exists
String curValue = envVarsTable.getProperty(varName);
if (curValue != null) {
@@ -596,7 +596,7 @@
* if any I/O exception occurred.
*/
public static boolean deleteInstalledFiles(String componentId, File parentDir,
- boolean includeDelegates) throws IOException {
+ boolean includeDelegates) throws IOException {
boolean done = true;
File rootDir = new File(parentDir, componentId);
if (!rootDir.isDirectory()) {
@@ -656,9 +656,8 @@
* if any I/O error occurred.
*/
protected static TestStatus deployInstallationVerificationTest(String mainRootDirPath,
- InstallationDescriptor mainInsD, String mainDescPath, String compClassPath,
- String javaLibPath, Properties tableOfEnvVars, String uimaClassPath)
- throws IOException {
+ InstallationDescriptor mainInsD, String mainDescPath, String compClassPath,
+ String javaLibPath, Properties tableOfEnvVars, String uimaClassPath) throws IOException {
// build command array to run installation tester app.
ArrayList cmdArrayList = new ArrayList();
StringBuffer cmdBuffer = new StringBuffer();
@@ -674,7 +673,7 @@
if (!javaExeFile.isFile()) {
// 2nd - try in 'java.home'/jre/bin folder
javaExePath = javaHome + java.io.File.separator + "jre" + java.io.File.separator + "bin"
- + java.io.File.separator + javaExeName;
+ + java.io.File.separator + javaExeName;
javaExeFile = new java.io.File(javaExePath);
}
cmdArrayList.add(javaExeFile.getAbsolutePath());
@@ -788,7 +787,7 @@
* if any I/O exception occurred.
*/
public static String extractFilesFromPEARFile(String componentId, String pearFileLocation,
- String fileExt, File targetDir) throws IOException {
+ String fileExt, File targetDir) throws IOException {
return extractFilesFromPEARFile(componentId, pearFileLocation, fileExt, targetDir, null);
}
@@ -811,8 +810,7 @@
* @throws IOException if any I/O exception occurred.
*/
protected static String extractFilesFromPEARFile(String componentId, String pearFileLocation,
- String fileExt, File targetDir, InstallationController controller)
- throws IOException {
+ String fileExt, File targetDir, InstallationController controller) throws IOException {
// get PEAR file size
long fileSize = FileUtil.getFileSize(pearFileLocation);
// create root directory
@@ -830,34 +828,33 @@
URL pearFileUrl = new URL(pearFileLocation);
if (controller != null) // write message to OUT msg queue
controller.getOutMsgWriter().println(
- "[InstallationController]: copying " + fileSize + " bytes from "
- + pearFileUrl.toExternalForm() + " to "
- + targetDir.getAbsolutePath());
+ "[InstallationController]: copying " + fileSize + " bytes from "
+ + pearFileUrl.toExternalForm() + " to " + targetDir.getAbsolutePath());
else
// print message to console
System.out.println("[InstallationController]: copying " + fileSize + " bytes from "
- + pearFileUrl.toExternalForm() + " to " + targetDir.getAbsolutePath());
+ + pearFileUrl.toExternalForm() + " to " + targetDir.getAbsolutePath());
String pearFileName = (new File(pearFileUrl.getFile())).getName();
pearFile = new File(targetDir, pearFileName);
if (!FileUtil.copyFile(pearFileUrl, pearFile))
throw new IOException("cannot copy " + pearFileUrl + " to file "
- + pearFile.getAbsolutePath());
+ + pearFile.getAbsolutePath());
removeLocalCopy = true;
}
if (controller != null) // write message to OUT msg queue
controller.getOutMsgWriter().println(
- "[InstallationController]: extracting " + pearFile.getAbsolutePath());
+ "[InstallationController]: extracting " + pearFile.getAbsolutePath());
else
// print message to console
System.out.println("[InstallationController]: extracting " + pearFile.getAbsolutePath());
JarFile jarFile = new JarFile(pearFile);
long totalBytes = (fileExt == null) ? FileUtil.extractFilesFromJar(jarFile, targetDir) : // all
- // files
- FileUtil.extractFilesWithExtFromJar( // files with extension
- jarFile, fileExt, targetDir);
+ // files
+ FileUtil.extractFilesWithExtFromJar( // files with extension
+ jarFile, fileExt, targetDir);
if (controller != null) // write message to OUT msg queue
controller.getOutMsgWriter().println(
- "[InstallationController]: " + totalBytes + " bytes extracted");
+ "[InstallationController]: " + totalBytes + " bytes extracted");
else
// print message to console
System.out.println("[InstallationController]: " + totalBytes + " bytes extracted");
@@ -892,7 +889,7 @@
* if any I/O exception occurred.
*/
public static String extractPEARFile(String componentId, String pearFileLocation,
- File installationDir) throws IOException {
+ File installationDir) throws IOException {
return extractFilesFromPEARFile(componentId, pearFileLocation, null, installationDir);
}
@@ -913,9 +910,9 @@
* @throws IOException if any I/O exception occurred.
*/
protected static String extractPEARFile(String componentId, String pearFileLocation,
- File installationDir, InstallationController controller) throws IOException {
+ File installationDir, InstallationController controller) throws IOException {
return extractFilesFromPEARFile(componentId, pearFileLocation, null, installationDir,
- controller);
+ controller);
}
/**
@@ -931,7 +928,7 @@
* If an I/O exception occurred while loading the installation descriptor files.
*/
protected static Hashtable getDelegateInstallationDescriptors(Hashtable installationTable)
- throws IOException {
+ throws IOException {
// get list of separately installed delegate components
Enumeration dlgIdList = installationTable.keys();
// build Hashtable of delegate InsD objects
@@ -975,10 +972,10 @@
* file system, or <code>null</code>, if the component is not installed.
*/
protected static String getInstalledComponentRootPath(String componentId,
- PackageSelector pkgSelector) {
+ PackageSelector pkgSelector) {
String componentRootPath = null;
PackageSelector packageSelector = (pkgSelector != null) ? pkgSelector
- : new SimplePackageSelector();
+ : new SimplePackageSelector();
// check if this component is already installed locally
File componentRootDir = packageSelector.selectPackageDirectory(componentId);
if (componentRootDir != null)
@@ -1003,7 +1000,7 @@
protected static String getPEARFileLocation(String componentId, PackageSelector pkgSelector) {
String pearFileLocation = null;
PackageSelector packageSelector = (pkgSelector != null) ? pkgSelector
- : new SimplePackageSelector();
+ : new SimplePackageSelector();
// check if the PEAR file is in the local FS
File pearFile = packageSelector.selectPackageFile(componentId);
if (pearFile != null)
@@ -1030,7 +1027,7 @@
// check args
if (args.length < 1) {
System.err.println("usage: InstallationController "
- + "{-local pear_file | main_component_id} [-root] " + "[installation_dir]");
+ + "{-local pear_file | main_component_id} [-root] " + "[installation_dir]");
return;
}
File localPearFile = null;
@@ -1058,19 +1055,19 @@
}
if (localPearFile == null && mainComponentId == null) {
System.err.println("usage: InstallationController "
- + "{-local pear_file | main_component_id} " + "[-root] [installation_dir]");
+ + "{-local pear_file | main_component_id} " + "[-root] [installation_dir]");
return;
}
// check input parameters
if (localPearFile != null && !localPearFile.exists()) {
System.err.println("[InstallationController]: " + localPearFile.getAbsolutePath()
- + " file not found");
+ + " file not found");
}
if (installationDir == null) // set CWD by default
installationDir = new File(".");
else if (!installationDir.isDirectory()) {
System.err.println("[InstallationController]: " + installationDir.getAbsolutePath()
- + " directory not found");
+ + " directory not found");
return;
}
// in local mode - get component ID from PEAR file
@@ -1091,33 +1088,31 @@
}
// create instance of InstallationController
InstallationController controller = __inLocalMode ? new InstallationController(mainComponentId,
- localPearFile, installationDir, installInRootDir) : new InstallationController(
- mainComponentId, installationDir.getAbsolutePath(), installInRootDir);
+ localPearFile, installationDir, installInRootDir) : new InstallationController(
+ mainComponentId, installationDir.getAbsolutePath(), installInRootDir);
// set PackageSelector
controller.setPackageSelector(new PackageSelectorGUI());
// 1st step: install main component
if (controller.installComponent() == null) {
// installation failed
controller.getErrMsgWriter().println(
- "[InstallationController]: installation of " + mainComponentId
- + " failed => \n" + controller.getInstallationMsg());
+ "[InstallationController]: installation of " + mainComponentId + " failed => \n"
+ + controller.getInstallationMsg());
} else {
try {
controller.getOutMsgWriter().println(
- "[InstallationController]: installation of " + mainComponentId
- + " completed");
+ "[InstallationController]: installation of " + mainComponentId + " completed");
// 2nd step: verify main component installation
if (controller.verifyComponent()) {
controller.getOutMsgWriter().println(
- "[InstallationController]: verification of " + mainComponentId
- + " completed");
+ "[InstallationController]: verification of " + mainComponentId + " completed");
controller.getOutMsgWriter().println(
- "[InstallationController]: " + mainComponentId + " installed in the "
- + controller._mainComponentRootPath + " directory.");
+ "[InstallationController]: " + mainComponentId + " installed in the "
+ + controller._mainComponentRootPath + " directory.");
} else {
controller.getOutMsgWriter().println(
- "[InstallationController]: verification of " + mainComponentId
- + " failed => \n" + controller.getVerificationMsg());
+ "[InstallationController]: verification of " + mainComponentId + " failed => \n"
+ + controller.getVerificationMsg());
}
} catch (Exception exc) {
System.err.println("Error in InstallationController.main(): " + exc.toString());
@@ -1145,7 +1140,7 @@
* if any I/O error occurred.
*/
protected static TestStatus runInstallationVerificationTest(String[] cmdArray, String[] envArray,
- File workDir) throws IOException {
+ File workDir) throws IOException {
if (System.getProperty("DEBUG") != null) {
System.out.println(">>> DBG: command array => ");
@@ -1211,7 +1206,7 @@
* message of the test.
*/
public static synchronized TestStatus verifyComponentInstallation(
- InstallationController controller, String uimaHomePath) {
+ InstallationController controller, String uimaHomePath) {
try {
// check input parameters
if (controller._insdObject == null)
@@ -1241,7 +1236,7 @@
tableOfEnvVars.setProperty("LD_LIBRARY_PATH", javaLibPath);
}
return deployInstallationVerificationTest(mainRootDirPath, mainInsD, mainDescPath,
- compClassPath, javaLibPath, tableOfEnvVars, uimaClassPath);
+ compClassPath, javaLibPath, tableOfEnvVars, uimaClassPath);
} catch (Throwable exc) {
// print exception as 'verification message'
StringWriter strWriter = new StringWriter();
@@ -1314,12 +1309,11 @@
* The given custom message listener or <code>null</code>.
*/
public InstallationController(String componentId, String rootDirPath, boolean installInRootDir,
- MessageRouter.StdChannelListener msgListener) {
+ MessageRouter.StdChannelListener msgListener) {
this(componentId, rootDirPath, installInRootDir, null, msgListener);
// print program information
getOutMsgWriter().println(
- "[InstallationController]: " + "OS - " + __osName + ", Host - "
- + _hostIpAddress);
+ "[InstallationController]: " + "OS - " + __osName + ", Host - " + _hostIpAddress);
if (__inLocalMode) {
getOutMsgWriter().println("[InstallationController]: " + "working in 'local' mode");
}
@@ -1352,8 +1346,8 @@
* The given custom message listener object or <code>null</code>.
*/
protected InstallationController(String componentId, String rootDirPath,
- boolean installInRootDir, MessageRouter msgRouter,
- MessageRouter.StdChannelListener msgListener) {
+ boolean installInRootDir, MessageRouter msgRouter,
+ MessageRouter.StdChannelListener msgListener) {
if (msgRouter == null)
_msgRouter = new MessageRouter();
else
@@ -1440,7 +1434,7 @@
* root directory.
*/
public InstallationController(String componentId, File localPearFile, File rootDir,
- boolean installInRootDir) {
+ boolean installInRootDir) {
this(componentId, rootDir.getAbsolutePath(), installInRootDir);
_mainPearFileLocation = localPearFile.getAbsolutePath();
}
@@ -1469,7 +1463,7 @@
* The given custom message listener or <code>null</code>.
*/
public InstallationController(String componentId, File localPearFile, File rootDir,
- boolean installInRootDir, MessageRouter.StdChannelListener msgListener) {
+ boolean installInRootDir, MessageRouter.StdChannelListener msgListener) {
this(componentId, rootDir.getAbsolutePath(), installInRootDir, msgListener);
_mainPearFileLocation = localPearFile.getAbsolutePath();
}
@@ -1512,7 +1506,7 @@
String dlgClassPath = buildComponentClassPath(dlgRootPath, dlgInsD);
if (dlgClassPath.length() > 0) {
if (cpBuffer.length() > 0
- && cpBuffer.charAt(cpBuffer.length() - 1) != File.pathSeparatorChar)
+ && cpBuffer.charAt(cpBuffer.length() - 1) != File.pathSeparatorChar)
cpBuffer.append(File.pathSeparatorChar);
cpBuffer.append(dlgClassPath);
}
@@ -1547,7 +1541,7 @@
String dlgPath = buildComponentPath(dlgRootPath, dlgInsD);
if (dlgPath.length() > 0) {
if (pBuffer.length() > 0
- && pBuffer.charAt(pBuffer.length() - 1) != File.pathSeparatorChar)
+ && pBuffer.charAt(pBuffer.length() - 1) != File.pathSeparatorChar)
pBuffer.append(File.pathSeparatorChar);
pBuffer.append(dlgPath);
}
@@ -1627,7 +1621,7 @@
installDelegateComponents();
// complete installation process for main component
InstallationProcessor processor = new InstallationProcessor(_mainComponentRootPath,
- _installationTable, this);
+ _installationTable, this);
processor.process();
_insdObject = processor.getInstallationDescriptor();
// save modified installation descriptor file
@@ -1637,12 +1631,11 @@
// generate 'setenv.bat' file
generateSetEnvFile();
getOutMsgWriter().println(
- "[InstallationController]: " + "the " + SET_ENV_FILE
- + " file contains required "
- + "environment variables for this component");
+ "[InstallationController]: " + "the " + SET_ENV_FILE + " file contains required "
+ + "environment variables for this component");
getOutMsgWriter().println(
- "[InstallationController]: component " + _mainComponentId
- + " installation completed.");
+ "[InstallationController]: component " + _mainComponentId
+ + " installation completed.");
if (_installationMonitor != null) {
// notify installation monitor
_installationMonitor.setInstallationLocation(_mainComponentId, _mainComponentRootPath);
@@ -1677,7 +1670,7 @@
_mainPearFileLocation = getPEARFileLocation(_mainComponentId, _packageSelector);
// extract main XML descriptors in a specified directory
if (extractFilesFromPEARFile(_mainComponentId, _mainPearFileLocation, ".xml",
- _mainComponentRoot, this) == null) {
+ _mainComponentRoot, this) == null) {
// PEAR extraction failed
// set error message
setInstallationError(new IOException("PEAR extraction failed"));
@@ -1692,12 +1685,12 @@
installDelegateComponentsDescriptors();
// complete installation process for main component
InstallationProcessor processor = new InstallationProcessor(_mainComponentRootPath,
- _installationTable);
+ _installationTable);
processor.process();
_insdObject = processor.getInstallationDescriptor();
getOutMsgWriter().println(
- "[InstallationController]: component " + _mainComponentId
- + " descriptors installation completed.");
+ "[InstallationController]: component " + _mainComponentId
+ + " descriptors installation completed.");
} catch (Exception exc) {
getErrMsgWriter().println("Error in InstallationController: " + exc);
exc.printStackTrace(getErrMsgWriter());
@@ -1727,19 +1720,18 @@
componentRootPath = getInstalledComponentRootPath(componentId, _packageSelector);
} catch (Exception e) {
getErrMsgWriter().println(
- "[InstallationController]: " + "failed to query " + componentId
- + " location - " + e);
+ "[InstallationController]: " + "failed to query " + componentId + " location - "
+ + e);
}
if (componentRootPath == null) {
// install next separate delegate component
InstallationController dlgController = new InstallationController(componentId,
- _installationDirPath, false, this._msgRouter, this._defaultMsgListener);
+ _installationDirPath, false, this._msgRouter, this._defaultMsgListener);
dlgController.setPackageSelector(this._packageSelector);
InstallationDescriptor dlgInsdObject = dlgController.installComponent();
if (dlgInsdObject == null) {
getErrMsgWriter().println(
- "[InstallationController]: " + "failed to install dlg component "
- + componentId);
+ "[InstallationController]: " + "failed to install dlg component " + componentId);
throw new RuntimeException("failed to install dlg component " + componentId);
}
componentRootPath = dlgInsdObject.getMainComponentRoot();
@@ -1773,14 +1765,13 @@
String componentId = (String) dlgList.nextElement();
// install XML descriptors of the next delegate component
InstallationController dlgController = new InstallationController(componentId,
- _installationDirPath, false, this._msgRouter, this._defaultMsgListener);
+ _installationDirPath, false, this._msgRouter, this._defaultMsgListener);
dlgController.setPackageSelector(this._packageSelector);
InstallationDescriptor dlgInsdObject = dlgController.installComponentDescriptors();
if (dlgInsdObject == null) {
getErrMsgWriter().println(
- "[InstallationController]: "
- + "failed to install descriptors for dlg component "
- + componentId);
+ "[InstallationController]: " + "failed to install descriptors for dlg component "
+ + componentId);
throw new RuntimeException("failed to install descriptors for dlg component " + componentId);
}
String componentRootPath = dlgInsdObject.getMainComponentRoot();
@@ -1822,8 +1813,7 @@
String varValue = envVarTable.getProperty(varName);
// add env.var. setting
if (varName.length() > 0 && varValue.length() > 0
- && !varName.equalsIgnoreCase(CLASSPATH_VAR)
- && !varName.equalsIgnoreCase(PATH_VAR)) {
+ && !varName.equalsIgnoreCase(CLASSPATH_VAR) && !varName.equalsIgnoreCase(PATH_VAR)) {
fWriter.println(varName + "=" + varValue);
}
}
@@ -1864,12 +1854,12 @@
}
// set local config params
packageConfig.setProperty(LocalInstallationAgent.MAIN_ROOT, _mainComponentRootPath.replace(
- '\\', '/'));
+ '\\', '/'));
Iterator dlgIdList = _installationTable.keySet().iterator();
while (dlgIdList.hasNext()) {
String id = (String) dlgIdList.next();
String idRoot = LocalInstallationAgent.COMP_ROOT_PREFIX + id
- + LocalInstallationAgent.COMP_ROOT_SUFFIX;
+ + LocalInstallationAgent.COMP_ROOT_SUFFIX;
packageConfig.setProperty(idRoot, ((String) _installationTable.get(id)).replace('\\', '/'));
}
// save pear config file
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java Tue Nov 28 14:25:39 2006
@@ -43,7 +43,7 @@
*/
public class InstallationDescriptor implements Serializable {
-
+
private static final long serialVersionUID = 4884186903126810934L;
/**
@@ -52,7 +52,7 @@
* @author LK
*/
public static class ActionInfo implements Serializable {
-
+
private static final long serialVersionUID = -3459024334454685063L;
/*
@@ -132,7 +132,7 @@
* @author LK
*/
public static class ComponentInfo implements Serializable {
-
+
private static final long serialVersionUID = 3269238133625161794L;
/**
@@ -287,7 +287,7 @@
* @return The relative path of the given component object.
*/
protected static String getRelativePathForComponentObject(String absolutePath,
- ComponentInfo component) {
+ ComponentInfo component) {
String path = absolutePath;
if (component.rootDirPath != null && path != null) {
File rootDir = new File(component.rootDirPath);
@@ -362,12 +362,12 @@
String key = (String) keys.nextElement();
String value = mAction.params.getProperty(key);
if (key.equals(InstallationDescriptorHandler.FILE_TAG)
- || key.equals(InstallationDescriptorHandler.REPLACE_WITH_TAG)
- || key.equals(InstallationDescriptorHandler.VAR_VALUE_TAG)) {
+ || key.equals(InstallationDescriptorHandler.REPLACE_WITH_TAG)
+ || key.equals(InstallationDescriptorHandler.VAR_VALUE_TAG)) {
if (_mainComponent.rootDirPath != null) {
// substitute '$main_root' macros
value = InstallationProcessor.substituteMainRootInString(value,
- _mainComponent.rootDirPath);
+ _mainComponent.rootDirPath);
mAction.params.setProperty(key, value);
}
Iterator dlgEntries = getDelegateComponents().entrySet().iterator();
@@ -377,7 +377,7 @@
if (dlgInfo.rootDirPath != null) {
// substitute '$dlg_comp_id$root' macros
value = InstallationProcessor.substituteCompIdRootInString(value, dlgInfo.getId(),
- dlgInfo.rootDirPath);
+ dlgInfo.rootDirPath);
mAction.params.setProperty(key, value);
}
}
@@ -601,8 +601,8 @@
public synchronized String getMainCasConsumerDesc(boolean relativePath) {
if (_mainComponent != null)
return relativePath ? getRelativePathForComponentObject(
- _mainComponent.casConsumerDescFilePath, _mainComponent)
- : _mainComponent.casConsumerDescFilePath;
+ _mainComponent.casConsumerDescFilePath, _mainComponent)
+ : _mainComponent.casConsumerDescFilePath;
return null;
}
@@ -628,8 +628,8 @@
public synchronized String getMainCasInitializerDesc(boolean relativePath) {
if (_mainComponent != null)
return relativePath ? getRelativePathForComponentObject(
- _mainComponent.casInitializerDescFilePath, _mainComponent)
- : _mainComponent.casInitializerDescFilePath;
+ _mainComponent.casInitializerDescFilePath, _mainComponent)
+ : _mainComponent.casInitializerDescFilePath;
return null;
}
@@ -655,8 +655,8 @@
public synchronized String getMainCollIteratorDesc(boolean relativePath) {
if (_mainComponent != null)
return relativePath ? getRelativePathForComponentObject(
- _mainComponent.collIteratorDescFilePath, _mainComponent)
- : _mainComponent.collIteratorDescFilePath;
+ _mainComponent.collIteratorDescFilePath, _mainComponent)
+ : _mainComponent.collIteratorDescFilePath;
return null;
}
@@ -697,7 +697,7 @@
return _mainComponent.descFilePath;
} else {
return relativePath ? getRelativePathForComponentObject(_mainComponent.descFilePath,
- _mainComponent) : _mainComponent.descFilePath;
+ _mainComponent) : _mainComponent.descFilePath;
}
} else
return _mainComponent.descFilePath;
@@ -728,8 +728,8 @@
*/
public synchronized Properties getMainComponentNetworkParam(String paramName) {
return (_mainComponent != null && _mainComponent.networkParams != null) ? (Properties) _mainComponent.networkParams
- .get(paramName)
- : null;
+ .get(paramName)
+ : null;
}
/**
@@ -737,8 +737,8 @@
*/
public synchronized Set getMainComponentNetworkParamNames() {
return (_mainComponent != null && _mainComponent.networkParams != null) ? _mainComponent.networkParams
- .keySet()
- : null;
+ .keySet()
+ : null;
}
/**
@@ -808,7 +808,7 @@
else {
// substitute '$dlg_comp_id$root' macros
dCompInfo.descFilePath = InstallationProcessor.substituteCompIdRootInString(
- dCompInfo.descFilePath, dlgId, dCompInfo.rootDirPath);
+ dCompInfo.descFilePath, dlgId, dCompInfo.rootDirPath);
}
}
}
@@ -865,7 +865,7 @@
// delegate descriptor path
if (dCompInfo.descFilePath != null) {
dCompInfo.descFilePath = InstallationProcessor.substituteCompIdRootInString(
- dCompInfo.descFilePath, dlgId, dCompInfo.rootDirPath);
+ dCompInfo.descFilePath, dlgId, dCompInfo.rootDirPath);
}
}
// substitute $dlg_comp_id$root macros in apropriate
@@ -878,10 +878,10 @@
String key = (String) keys.nextElement();
String value = action.params.getProperty(key);
if (key.equals(InstallationDescriptorHandler.FILE_TAG)
- || key.equals(InstallationDescriptorHandler.REPLACE_WITH_TAG)
- || key.equals(InstallationDescriptorHandler.VAR_VALUE_TAG)) {
+ || key.equals(InstallationDescriptorHandler.REPLACE_WITH_TAG)
+ || key.equals(InstallationDescriptorHandler.VAR_VALUE_TAG)) {
value = InstallationProcessor.substituteCompIdRootInString(value, dlgId,
- dCompInfo.rootDirPath);
+ dCompInfo.rootDirPath);
action.params.setProperty(key, value);
}
}
@@ -900,7 +900,7 @@
_mainComponent.casConsumerDescFilePath = descFilePath.trim().replace('\\', '/');
else { // substitute $main_root macros in descriptor path
_mainComponent.casConsumerDescFilePath = InstallationProcessor.substituteMainRootInString(
- descFilePath, _mainComponent.rootDirPath);
+ descFilePath, _mainComponent.rootDirPath);
}
}
}
@@ -917,7 +917,7 @@
_mainComponent.casInitializerDescFilePath = descFilePath.trim().replace('\\', '/');
else { // substitute $main_root macros in descriptor path
_mainComponent.casInitializerDescFilePath = InstallationProcessor
- .substituteMainRootInString(descFilePath, _mainComponent.rootDirPath);
+ .substituteMainRootInString(descFilePath, _mainComponent.rootDirPath);
}
}
}
@@ -934,7 +934,7 @@
_mainComponent.collIteratorDescFilePath = descFilePath.trim().replace('\\', '/');
else { // substitute $main_root macros in descriptor path
_mainComponent.collIteratorDescFilePath = InstallationProcessor.substituteMainRootInString(
- descFilePath, _mainComponent.rootDirPath);
+ descFilePath, _mainComponent.rootDirPath);
}
}
}
@@ -988,7 +988,7 @@
_mainComponent.descFilePath = descFilePath.trim().replace('\\', '/');
else { // substitute $main_root macros in descriptor path
_mainComponent.descFilePath = InstallationProcessor.substituteMainRootInString(
- descFilePath, _mainComponent.rootDirPath);
+ descFilePath, _mainComponent.rootDirPath);
}
}
}
@@ -1060,17 +1060,17 @@
// substitute $main_root macros in all specs of descriptor files
if (_mainComponent.descFilePath != null)
_mainComponent.descFilePath = InstallationProcessor.substituteMainRootInString(
- _mainComponent.descFilePath, _mainComponent.rootDirPath);
+ _mainComponent.descFilePath, _mainComponent.rootDirPath);
if (_mainComponent.collIteratorDescFilePath != null)
_mainComponent.collIteratorDescFilePath = InstallationProcessor.substituteMainRootInString(
- _mainComponent.collIteratorDescFilePath, _mainComponent.rootDirPath);
+ _mainComponent.collIteratorDescFilePath, _mainComponent.rootDirPath);
if (_mainComponent.casInitializerDescFilePath != null)
_mainComponent.casInitializerDescFilePath = InstallationProcessor
- .substituteMainRootInString(_mainComponent.casInitializerDescFilePath,
- _mainComponent.rootDirPath);
+ .substituteMainRootInString(_mainComponent.casInitializerDescFilePath,
+ _mainComponent.rootDirPath);
if (_mainComponent.casConsumerDescFilePath != null)
_mainComponent.casConsumerDescFilePath = InstallationProcessor.substituteMainRootInString(
- _mainComponent.casConsumerDescFilePath, _mainComponent.rootDirPath);
+ _mainComponent.casConsumerDescFilePath, _mainComponent.rootDirPath);
// substitute $main_root macros in all specs of actions
Iterator list = getInstallationActions().iterator();
while (list.hasNext()) {
@@ -1080,10 +1080,10 @@
String key = (String) keys.nextElement();
String value = action.params.getProperty(key);
if (key.equals(InstallationDescriptorHandler.FILE_TAG)
- || key.equals(InstallationDescriptorHandler.REPLACE_WITH_TAG)
- || key.equals(InstallationDescriptorHandler.VAR_VALUE_TAG)) {
+ || key.equals(InstallationDescriptorHandler.REPLACE_WITH_TAG)
+ || key.equals(InstallationDescriptorHandler.VAR_VALUE_TAG)) {
value = InstallationProcessor.substituteMainRootInString(value,
- _mainComponent.rootDirPath);
+ _mainComponent.rootDirPath);
action.params.setProperty(key, value);
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptorHandler.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptorHandler.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptorHandler.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptorHandler.java Tue Nov 28 14:25:39 2006
@@ -167,7 +167,7 @@
* if any I/O exception occurred.
*/
public static InputStream getInstallationDescriptorAsStream(InstallationDescriptor insdObject)
- throws IOException {
+ throws IOException {
InputStream iStream = null;
StringBuffer xmlBuffer = new StringBuffer();
xmlBuffer.append(XML_HEADER);
@@ -190,7 +190,7 @@
* if any I/O exception occurred.
*/
public static void printInstallationDescriptor(InstallationDescriptor insdObject,
- PrintWriter oWriter) throws IOException {
+ PrintWriter oWriter) throws IOException {
String[] tagOrder = null;
// ROOT - 0th level
XMLUtil.printXMLTag(ROOT_TAG, oWriter, false, 0);
@@ -203,7 +203,7 @@
tagOrder[0] = NAME_TAG;
if (insdObject.getOSSpecs().size() > 0)
XMLUtil.printAllXMLElements(insdObject.getOSSpecs(),
- InstallationDescriptor.PROPERTY_DELIMITER, tagOrder, oWriter, 2);
+ InstallationDescriptor.PROPERTY_DELIMITER, tagOrder, oWriter, 2);
// OS specs end - 1st level
XMLUtil.printXMLTag(OS_TAG, oWriter, true, 1);
oWriter.println();
@@ -213,7 +213,7 @@
// 2nd level elements (multi-value properties) - no order
if (insdObject.getToolkitsSpecs().size() > 0)
XMLUtil.printAllXMLElements(insdObject.getToolkitsSpecs(),
- InstallationDescriptor.PROPERTY_DELIMITER, null, oWriter, 2);
+ InstallationDescriptor.PROPERTY_DELIMITER, null, oWriter, 2);
// TOOLKITS specs end - 1st level
XMLUtil.printXMLTag(TOOLKITS_TAG, oWriter, true, 1);
oWriter.println();
@@ -223,7 +223,7 @@
// 2nd level elements (multi-value properties) - no order
if (insdObject.getFrameworkSpecs().size() > 0)
XMLUtil.printAllXMLElements(insdObject.getFrameworkSpecs(),
- InstallationDescriptor.PROPERTY_DELIMITER, null, oWriter, 2);
+ InstallationDescriptor.PROPERTY_DELIMITER, null, oWriter, 2);
// UIMA_FRAMEWORK specs end - 1st level
XMLUtil.printXMLTag(UIMA_FRAMEWORK_TAG, oWriter, true, 1);
oWriter.println();
@@ -342,7 +342,7 @@
// 3rd level elements
String dlgId = (String) dlgList.next();
InstallationDescriptor.ComponentInfo dlgInfo = (InstallationDescriptor.ComponentInfo) dlgTable
- .get(dlgId);
+ .get(dlgId);
XMLUtil.printXMLElement(ID_TAG, dlgId, oWriter, 3);
oWriter.println();
XMLUtil.printXMLElement(NAME_TAG, dlgInfo.name, oWriter, 3);
@@ -355,7 +355,7 @@
Iterator actList = insdObject.getInstallationActions().iterator();
while (actList.hasNext()) {
InstallationDescriptor.ActionInfo actInfo = (InstallationDescriptor.ActionInfo) actList
- .next();
+ .next();
// PROCESS specs - 2nd level
XMLUtil.printXMLTag(PROCESS_TAG, oWriter, false, 2);
oWriter.println();
@@ -394,7 +394,7 @@
* if any I/O exception occurred.
*/
public static void saveInstallationDescriptor(InstallationDescriptor insdObject, File xmlFile)
- throws IOException {
+ throws IOException {
PrintWriter oWriter = null;
try {
oWriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(xmlFile), "UTF-8"));
@@ -506,8 +506,7 @@
_activeArg.value = elemValue;
} else if (localName.equalsIgnoreCase(ARGUMENT_TAG)) {
if (SERVICE_COMMAND_ARGS_TAG.equals(_activeSubSection) && _activeService != null
- && _activeArg != null && _activeArg.value != null
- && _activeArg.value.length() > 0)
+ && _activeArg != null && _activeArg.value != null && _activeArg.value.length() > 0)
_activeService.addArg(_activeArg);
_activeArg = null;
} else if (localName.equalsIgnoreCase(NETWORK_PARAMETERS_TAG)) {
@@ -628,7 +627,7 @@
* Any SAX exception, possibly wrapping another exception.
*/
public synchronized void parseInstallationDescriptor(JarFile pearFile) throws IOException,
- SAXException {
+ SAXException {
String insdFilePath = InstallationProcessor.INSD_FILE_PATH;
JarEntry insdJarEntry = pearFile.getJarEntry(insdFilePath);
if (insdJarEntry != null) {
@@ -674,7 +673,7 @@
* Any SAX exception, possibly wrapping another exception.
*/
public void startElement(String uri, String localName, String qName, Attributes attributes)
- throws SAXException {
+ throws SAXException {
_mainTag = localName;
_activeBuffer.setLength(0);
if (_mainTag.equalsIgnoreCase(OS_TAG)) {
@@ -691,7 +690,7 @@
_activeSubSection = SERVICE_COMMAND_ARGS_TAG;
} else if (_mainTag.equalsIgnoreCase(ARGUMENT_TAG)) {
if (SUBMITTED_COMPONENT_TAG.equals(_activeSection)
- && SERVICE_COMMAND_ARGS_TAG.equals(_activeSubSection))
+ && SERVICE_COMMAND_ARGS_TAG.equals(_activeSubSection))
_activeArg = new InstallationDescriptor.ArgInfo();
} else if (_mainTag.equalsIgnoreCase(NETWORK_PARAMETERS_TAG)) {
if (SUBMITTED_COMPONENT_TAG.equals(_activeSection))
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationProcessor.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationProcessor.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationProcessor.java Tue Nov 28 14:25:39 2006
@@ -116,7 +116,7 @@
* if any I/O exception occurred.
*/
public static void generateVSDescriptor(InstallationDescriptor insdObject, File mainRootDir)
- throws IOException {
+ throws IOException {
File vsDescriptorFile = new File(mainRootDir, VS_DESCRIPTOR_PATH);
PrintWriter oWriter = null;
try {
@@ -146,7 +146,7 @@
* if any I/O exception occurred.
*/
public static InputStream generateVSDescriptorAsStream(InstallationDescriptor insdObject)
- throws IOException {
+ throws IOException {
InputStream iStream = null;
String xmlContent = generateVSDescriptorContent(insdObject);
byte[] xmlContentBytes = xmlContent.getBytes();
@@ -193,7 +193,7 @@
* if any I/O exception occurred.
*/
protected static void findAndReplacePath(InstallationDescriptor.ActionInfo action)
- throws IOException {
+ throws IOException {
// get action parameters
String filePath = action.params.getProperty(InstallationDescriptorHandler.FILE_TAG);
if (filePath == null)
@@ -204,7 +204,7 @@
String replaceWith = action.params.getProperty(InstallationDescriptorHandler.REPLACE_WITH_TAG);
if (replaceWith == null)
throw new RuntimeException("no " + InstallationDescriptorHandler.REPLACE_WITH_TAG
- + " defined");
+ + " defined");
// replace all specified path-strings in specified file
File inputFile = new File(filePath);
FileUtil.replaceStringInFile(inputFile, StringUtil.toRegExpString(findString), replaceWith);
@@ -224,7 +224,7 @@
* replaced with '/' characters.
*/
protected static String substituteCompIdRootInString(String source, String compId,
- String compRootPath) {
+ String compRootPath) {
String result = source;
// substitute '$dlg_comp_id$root_url'
String regExp = componentIdRootRegExp(compId, DELEGATE_ROOT_URL_SUFFIX_REGEX);
@@ -284,7 +284,7 @@
* The given <code>InstallationController</code> requestor.
*/
public InstallationProcessor(String mainRootPath, Hashtable installationTable,
- InstallationController controller) {
+ InstallationController controller) {
_controller = controller;
_mainRootPath = mainRootPath.replace('\\', '/');
_installationTable = installationTable;
@@ -333,11 +333,11 @@
File xmlInsDFile = new File(mainRootDir, INSD_FILE_PATH);
if (_controller != null)
_controller.getOutMsgWriter().println(
- "[InstallationProcessor]: " + "start processing InsD file - "
- + xmlInsDFile.getAbsolutePath());
+ "[InstallationProcessor]: " + "start processing InsD file - "
+ + xmlInsDFile.getAbsolutePath());
else
System.out.println("[InstallationProcessor]: " + "start processing InsD file - "
- + xmlInsDFile.getAbsolutePath());
+ + xmlInsDFile.getAbsolutePath());
InstallationDescriptorHandler insdHandler = new InstallationDescriptorHandler();
try {
insdHandler.parse(xmlInsDFile);
@@ -353,7 +353,7 @@
Iterator actionList = _insdObject.getInstallationActions().iterator();
while (actionList.hasNext()) {
InstallationDescriptor.ActionInfo action = (InstallationDescriptor.ActionInfo) actionList
- .next();
+ .next();
// substitute string 'variables' in action parameters
substituteStringVariablesInAction(action.params);
// perform FIND_AND_REPLACE_PATH_ACT action
@@ -390,8 +390,8 @@
if (paramName.equals(InstallationDescriptorHandler.VAR_VALUE_TAG))
paramValue = paramValue.replace(';', File.pathSeparatorChar);
if (paramName.equals(InstallationDescriptorHandler.FILE_TAG)
- || paramName.equals(InstallationDescriptorHandler.REPLACE_WITH_TAG)
- || paramName.equals(InstallationDescriptorHandler.VAR_VALUE_TAG)) {
+ || paramName.equals(InstallationDescriptorHandler.REPLACE_WITH_TAG)
+ || paramName.equals(InstallationDescriptorHandler.VAR_VALUE_TAG)) {
// substitute '$main_root_url' and '$main_root'
paramValue = substituteMainRootInString(paramValue, _mainRootPath);
// substitute '$dlg_comp_id$root_url'
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationTester.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationTester.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationTester.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationTester.java Tue Nov 28 14:25:39 2006
@@ -67,7 +67,7 @@
public static void main(String[] args) throws Exception {
if (System.getProperty("DEBUG") != null) {
System.out.println("<DBG> [InstallationTester]: arg=" + args[0] + "; CP="
- + System.getProperty("java.class.path"));
+ + System.getProperty("java.class.path"));
}
UIMAFramework.getLogger().setLevel(Level.OFF);
try {
@@ -107,7 +107,7 @@
* if this exception occurred while identifying UIMA component category.
*/
public InstallationTester(String compDescFilePath) throws IOException, InvalidXMLException,
- ResourceInitializationException, UIMAException, UIMARuntimeException {
+ ResourceInitializationException, UIMAException, UIMARuntimeException {
// check UIMA category of the main component
File compDescFile = new File(compDescFilePath);
String uimaCategory = UIMAUtil.identifyUimaComponentCategory(compDescFile);
@@ -152,7 +152,7 @@
* If the specified AE cannot be instantiated.
*/
public static boolean testAnalysisEngine(File aeSpecifierFile) throws IOException,
- InvalidXMLException, ResourceInitializationException {
+ InvalidXMLException, ResourceInitializationException {
try {
XMLInputSource xmlIn = new XMLInputSource(aeSpecifierFile);
ResourceSpecifier aeSpecifier = UIMAFramework.getXMLParser().parseResourceSpecifier(xmlIn);
@@ -164,8 +164,7 @@
return false;
} catch (IOException ioE) {
System.err
- .println("Error on creating XML source from descriptor file :: "
- + ioE.getMessage());
+ .println("Error on creating XML source from descriptor file :: " + ioE.getMessage());
throw ioE;
} catch (InvalidXMLException inxE) {
System.err.println("Error on parsing the XML source file :: " + inxE.getMessage());
@@ -191,7 +190,7 @@
* If the specified CC cannot be instantiated.
*/
public static boolean testCasConsumer(File ccSpecifierFile) throws IOException,
- InvalidXMLException, ResourceInitializationException {
+ InvalidXMLException, ResourceInitializationException {
try {
XMLInputSource xmlIn = new XMLInputSource(ccSpecifierFile);
ResourceSpecifier ccSpecifier = UIMAFramework.getXMLParser().parseResourceSpecifier(xmlIn);
@@ -199,8 +198,7 @@
return cc != null;
} catch (IOException ioE) {
System.err
- .println("Error on creating XML source from descriptor file :: "
- + ioE.getMessage());
+ .println("Error on creating XML source from descriptor file :: " + ioE.getMessage());
throw ioE;
} catch (InvalidXMLException inxE) {
System.err.println("Error on parsing the XML source file :: " + inxE.getMessage());
@@ -226,7 +224,7 @@
* If the specified CI cannot be instantiated.
*/
public static boolean testCasInitializer(File ciSpecifierFile) throws IOException,
- InvalidXMLException, ResourceInitializationException {
+ InvalidXMLException, ResourceInitializationException {
try {
XMLInputSource xmlIn = new XMLInputSource(ciSpecifierFile);
ResourceSpecifier ciSpecifier = UIMAFramework.getXMLParser().parseResourceSpecifier(xmlIn);
@@ -234,8 +232,7 @@
return ci != null;
} catch (IOException ioE) {
System.err
- .println("Error on creating XML source from descriptor file :: "
- + ioE.getMessage());
+ .println("Error on creating XML source from descriptor file :: " + ioE.getMessage());
throw ioE;
} catch (InvalidXMLException inxE) {
System.err.println("Error on parsing the XML source file :: " + inxE.getMessage());
@@ -261,7 +258,7 @@
* If the specified CR cannot be instantiated.
*/
public static boolean testCollectionReader(File crSpecifierFile) throws IOException,
- InvalidXMLException, ResourceInitializationException {
+ InvalidXMLException, ResourceInitializationException {
try {
XMLInputSource xmlIn = new XMLInputSource(crSpecifierFile);
ResourceSpecifier crSpecifier = UIMAFramework.getXMLParser().parseResourceSpecifier(xmlIn);
@@ -269,8 +266,7 @@
return cr != null;
} catch (IOException ioE) {
System.err
- .println("Error on creating XML source from descriptor file :: "
- + ioE.getMessage());
+ .println("Error on creating XML source from descriptor file :: " + ioE.getMessage());
throw ioE;
} catch (InvalidXMLException inxE) {
System.err.println("Error on parsing the XML source file :: " + inxE.getMessage());
@@ -296,17 +292,16 @@
* If the specified CPE cannot be instantiated.
*/
public static boolean testCpeCongifuration(File cpeSpecifierFile) throws IOException,
- InvalidXMLException, ResourceInitializationException {
+ InvalidXMLException, ResourceInitializationException {
try {
XMLInputSource xmlIn = new XMLInputSource(cpeSpecifierFile);
CpeDescription cpeDescription = UIMAFramework.getXMLParser().parseCpeDescription(xmlIn);
CollectionProcessingEngine cpe = UIMAFramework
- .produceCollectionProcessingEngine(cpeDescription);
+ .produceCollectionProcessingEngine(cpeDescription);
return cpe != null;
} catch (IOException ioE) {
System.err
- .println("Error on creating XML source from descriptor file :: "
- + ioE.getMessage());
+ .println("Error on creating XML source from descriptor file :: " + ioE.getMessage());
throw ioE;
} catch (InvalidXMLException inxE) {
System.err.println("Error on parsing the XML source file :: " + inxE.getMessage());
@@ -333,20 +328,19 @@
* If the specified TS cannot be used to create a CAS.
*/
public static boolean testTypeSystem(File tsSpecifierFile) throws IOException,
- InvalidXMLException, ResourceInitializationException {
+ InvalidXMLException, ResourceInitializationException {
try {
XMLInputSource xmlIn = new XMLInputSource(tsSpecifierFile);
TypeSystemDescription tsDescription = UIMAFramework.getXMLParser()
- .parseTypeSystemDescription(xmlIn);
+ .parseTypeSystemDescription(xmlIn);
TypePriorities tPriorities = UIMAFramework.getResourceSpecifierFactory()
- .createTypePriorities();
+ .createTypePriorities();
FsIndexDescription[] fsIndexes = new FsIndexDescription[0];
CAS cas = CasCreationUtils.createCas(tsDescription, tPriorities, fsIndexes);
return cas != null;
} catch (IOException ioE) {
System.err
- .println("Error on creating XML source from descriptor file :: "
- + ioE.getMessage());
+ .println("Error on creating XML source from descriptor file :: " + ioE.getMessage());
throw ioE;
} catch (InvalidXMLException inxE) {
System.err.println("Error on parsing the XML source file :: " + inxE.getMessage());