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:22:44 UTC
svn commit: r480243 [11/13] - in /incubator/uima/uimaj/trunk/uimaj-cpe/src:
main/java/org/apache/uima/cas_data/impl/vinci/
main/java/org/apache/uima/collection/impl/
main/java/org/apache/uima/collection/impl/base_cpm/container/
main/java/org/apache/uim...
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/SequencedQueue.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/SequencedQueue.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/SequencedQueue.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/SequencedQueue.java Tue Nov 28 14:22:38 2006
@@ -96,9 +96,9 @@
notifyAll();
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
- "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_chunk_state_false_timeout__FINEST",
- new Object[] { Thread.currentThread().getName(), getName() });
+ "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_chunk_state_false_timeout__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName() });
}
chunkState = false;
@@ -123,9 +123,8 @@
if (numberElementsInQueue == 0) {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
- "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_queue_empty__FINEST",
- new Object[] { Thread.currentThread().getName(), getName() });
+ "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_queue_empty__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName() });
}
return null;
}
@@ -137,13 +136,13 @@
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(
- Level.FINEST,
- this.getClass().getName(),
- "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_expected_chunk_sequenece__FINEST",
- new Object[] { Thread.currentThread().getName(), getName(),
- String.valueOf(chunkSequence) });
+ Level.FINEST,
+ this.getClass().getName(),
+ "process",
+ CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_expected_chunk_sequenece__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName(),
+ String.valueOf(chunkSequence) });
}
try {
// This does not remove the object from the queue
@@ -154,9 +153,8 @@
notifyAll();
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
- "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_got_eof_token__FINEST",
- new Object[] { Thread.currentThread().getName(), getName() });
+ "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_got_eof_token__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName() });
}
return anObject;
}
@@ -168,16 +166,15 @@
// Create metadata from the CAS. This convenience object is used internally and keeps
// track of the last chunks sequence processed here
ChunkMetadata chunkMetadata = CPMUtils.getChunkMetadata(((CAS[]) ((WorkUnit) anObject)
- .get())[0]);
+ .get())[0]);
// Chunking is not strictly required. In such cases the sequence metadata will not be in
// the CAS and thus there is no ChunkMetaData
if (chunkMetadata == null) {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST,
- this.getClass().getName(), "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_chunk_meta_is_null__FINEST",
- new Object[] { Thread.currentThread().getName(), getName() });
+ this.getClass().getName(), "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_chunk_meta_is_null__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName() });
}
break;
}
@@ -195,43 +192,42 @@
if (chunkMetadata.isOneOfMany() && sequenceTimedOut(chunkMetadata)) {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(
- Level.FINEST,
- this.getClass().getName(),
- "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_sequence_timed_out__FINEST",
- new Object[] { Thread.currentThread().getName(), getName(),
- String.valueOf(chunkMetadata.getSequence()) });
+ Level.FINEST,
+ this.getClass().getName(),
+ "process",
+ CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_sequence_timed_out__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName(),
+ String.valueOf(chunkMetadata.getSequence()) });
}
return timedOutCas(queueIndex);
}
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
- "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_iscas__FINEST",
- new Object[] { Thread.currentThread().getName(), getName() });
+ "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_iscas__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName() });
}
// The queue gets into a chunk state IFF the CAS is part of the larger document that has
// been "chopped" up into smaller chunks.
if (chunkState) {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(
- Level.FINEST,
- this.getClass().getName(),
- "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_in_chunk_state__FINEST",
- new Object[] { Thread.currentThread().getName(), getName(),
- nextChunkMetadata.getDocId(), chunkMetadata.getDocId(),
- String.valueOf(chunkSequence),
- String.valueOf(chunkMetadata.getSequence()) });
+ Level.FINEST,
+ this.getClass().getName(),
+ "process",
+ CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_in_chunk_state__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName(),
+ nextChunkMetadata.getDocId(), chunkMetadata.getDocId(),
+ String.valueOf(chunkSequence),
+ String.valueOf(chunkMetadata.getSequence()) });
}
// Is it the expected sequence?
if (chunkMetadata.getSequence() == chunkSequence) {
// Make sure to cross-reference with expected document id. This CAS could be part of a
// different document!
if (chunkSequence > 1
- && !nextChunkMetadata.getDocId().equalsIgnoreCase(
- chunkMetadata.getDocId())) {
+ && !nextChunkMetadata.getDocId().equalsIgnoreCase(chunkMetadata.getDocId())) {
// Sequence number is a match BUT this sequence belongs to another document. So skip
// and get the next CAS from the queue
queueIndex++;
@@ -242,10 +238,9 @@
if (chunkMetadata.isLast()) {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST,
- this.getClass().getName(), "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_change_chunk_state__FINEST",
- new Object[] { Thread.currentThread().getName(), getName() });
+ this.getClass().getName(), "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_change_chunk_state__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName() });
}
chunkState = false;
nextChunkMetadata = new ChunkMetadata("", 0, false);
@@ -262,46 +257,44 @@
// Currently NOT in a chunk state
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST,
- this.getClass().getName(), "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_not_in_chunk_state__FINEST",
- new Object[] { Thread.currentThread().getName(), getName() });
+ this.getClass().getName(), "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_not_in_chunk_state__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName() });
}
if (chunkMetadata.isOneOfMany()) // sequence > 0
{
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST,
- this.getClass().getName(), "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_begin_chunk_state__FINEST",
- new Object[] { Thread.currentThread().getName(), getName() });
+ this.getClass().getName(), "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_begin_chunk_state__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName() });
}
chunkState = true;
if (chunkMetadata.getSequence() == chunkSequence) {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(
- Level.FINEST,
- this.getClass().getName(),
- "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_in_chunk_state__FINEST",
- new Object[] { Thread.currentThread().getName(), getName(),
- nextChunkMetadata.getDocId(), chunkMetadata.getDocId(),
- String.valueOf(chunkSequence),
- String.valueOf(chunkMetadata.getSequence()) });
+ Level.FINEST,
+ this.getClass().getName(),
+ "process",
+ CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_in_chunk_state__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName(),
+ nextChunkMetadata.getDocId(), chunkMetadata.getDocId(),
+ String.valueOf(chunkSequence),
+ String.valueOf(chunkMetadata.getSequence()) });
}
if (sequenceTimedOut(chunkMetadata)) {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(
- Level.FINEST,
- this.getClass().getName(),
- "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_sequence_timed_out__FINEST",
- new Object[] { Thread.currentThread().getName(), getName(),
- String.valueOf(chunkMetadata.getSequence()) });
+ Level.FINEST,
+ this.getClass().getName(),
+ "process",
+ CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_sequence_timed_out__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName(),
+ String.valueOf(chunkMetadata.getSequence()) });
}
return timedOutCas(queueIndex);
}
@@ -322,20 +315,20 @@
if (anObject == null) {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST,
- this.getClass().getName(), "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_null_cas__FINEST",
- new Object[] { Thread.currentThread().getName(), getName() });
+ this.getClass().getName(), "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_null_cas__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName() });
}
} else {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(
- Level.FINEST,
- this.getClass().getName(),
- "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_not_cas__FINEST",
- new Object[] { Thread.currentThread().getName(), getName(),
- anObject.getClass().getName() });
+ Level.FINEST,
+ this.getClass().getName(),
+ "process",
+ CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_not_cas__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName(),
+ anObject.getClass().getName() });
}
break;
}
@@ -356,38 +349,37 @@
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
- "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_done_scanning_q__FINEST",
- new Object[] { Thread.currentThread().getName(), getName() });
+ "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_done_scanning_q__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName() });
}
// We scanned the queue and the expected sequence chunk has not been found.
if (queueIndex == queueSize) {
if (chunkSequence > 0) {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(
- Level.FINEST,
- this.getClass().getName(),
- "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_expecte_seq_not_found__FINEST",
- new Object[] { Thread.currentThread().getName(), getName(),
- String.valueOf(queue.size()) });
+ Level.FINEST,
+ this.getClass().getName(),
+ "process",
+ CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_expecte_seq_not_found__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName(),
+ String.valueOf(queue.size()) });
}
// Reset expected sequence to the same number. The caller most likely will sleep for awhile
// and retry. During the retry we need to
// look for the same sequence we failed to find during this iteration.
nextChunkMetadata = new ChunkMetadata(nextChunkMetadata.getDocId(), chunkSequence - 1,
- false);
+ false);
}
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(
- Level.FINEST,
- this.getClass().getName(),
- "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_expecte_seq_not_found__FINEST",
- new Object[] { Thread.currentThread().getName(), getName(),
- String.valueOf(queue.size()) });
+ Level.FINEST,
+ this.getClass().getName(),
+ "process",
+ CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_expecte_seq_not_found__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName(),
+ String.valueOf(queue.size()) });
}
// Return null to indicate the expected CAS was not found. It is the responsibility of the
// caller to wait and invoke this method again.
@@ -402,13 +394,13 @@
notifyAll();
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(
- Level.FINEST,
- this.getClass().getName(),
- "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_show_queue_capacity__FINEST",
- new Object[] { Thread.currentThread().getName(), getName(),
- String.valueOf(queueSize), String.valueOf(numberElementsInQueue) });
+ Level.FINEST,
+ this.getClass().getName(),
+ "process",
+ CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_show_queue_capacity__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName(),
+ String.valueOf(queueSize), String.valueOf(numberElementsInQueue) });
}
return anObject;
}
@@ -429,9 +421,8 @@
try {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
- "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_wait_for_chunk__FINEST",
- new Object[] { Thread.currentThread().getName(), getName() });
+ "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_wait_for_chunk__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName() });
}
wait(20);
} catch (InterruptedException e) {
@@ -442,29 +433,29 @@
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
- "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_timedout_waiting_for_chunk__FINEST",
- new Object[] { Thread.currentThread().getName(), getName(), docId });
+ "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_timedout_waiting_for_chunk__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName(), docId });
}
if (docId != null && docId.trim().length() > 0 && !timedOutDocs.containsKey(docId)) {
// cache the docId in the list of documents that have been marked as invalid
addDocToTimedOutDocs(10000, docId);
// Notify the listeners of the timeout
CPMChunkTimeoutException toe = new CPMChunkTimeoutException(Long.parseLong(docId),
- nextChunkMetadata.getThrottleID(), nextChunkMetadata.getURL());
+ nextChunkMetadata.getThrottleID(), nextChunkMetadata.getURL());
EntityProcessStatusImpl enProcSt = new EntityProcessStatusImpl(null);
enProcSt.addEventStatus("Process", "Failed", toe);
doNotifyListeners(null, enProcSt);
}
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(
- Level.FINEST,
- this.getClass().getName(),
- "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_chunk_didnt_arrive__FINEST",
- new Object[] { Thread.currentThread().getName(), getName(),
- String.valueOf(aTimeout) });
+ Level.FINEST,
+ this.getClass().getName(),
+ "process",
+ CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_chunk_didnt_arrive__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName(),
+ String.valueOf(aTimeout) });
}
chunkState = false;
nextChunkMetadata = new ChunkMetadata("", 0, false);
@@ -475,13 +466,13 @@
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(
- Level.FINEST,
- this.getClass().getName(),
- "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_return_chunk__FINEST",
- new Object[] { Thread.currentThread().getName(), getName(),
- String.valueOf(queueSize), String.valueOf(numberElementsInQueue) });
+ Level.FINEST,
+ this.getClass().getName(),
+ "process",
+ CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_return_chunk__FINEST",
+ new Object[] { Thread.currentThread().getName(), getName(),
+ String.valueOf(queueSize), String.valueOf(numberElementsInQueue) });
}
return resource;
@@ -489,7 +480,7 @@
public synchronized void invalidate(CAS[] aCasObjectList) {
for (int i = 0; aCasObjectList != null && i < aCasObjectList.length
- && aCasObjectList[i] != null; i++) {
+ && aCasObjectList[i] != null; i++) {
ChunkMetadata meta = CPMUtils.getChunkMetadata(aCasObjectList[i]);
if (meta != null && meta.getDocId().trim().length() > 0 && meta.getSequence() > 0) {
if (!timedOutDocs.containsKey(meta.getDocId())) {
@@ -535,7 +526,7 @@
for (int j = 0; j < statusCbL.size(); j++) {
BaseStatusCallbackListener statCL = (BaseStatusCallbackListener) statusCbL.get(j);
((StatusCallbackListener) statCL).entityProcessComplete((CAS) casObjectCopy,
- aEntityProcStatus);
+ aEntityProcStatus);
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CPMUtils.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CPMUtils.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CPMUtils.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CPMUtils.java Tue Nov 28 14:22:38 2006
@@ -154,10 +154,10 @@
if (System.getProperty("DEBUG_EVENTS") != null) {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(CPMUtils.class).log(
- Level.FINEST,
- "Returning Report With Event::" + aEvType + " For Component:::"
- + prEvent.getComponentName() + " Duration:::"
- + prEvent.getDurationExcludingSubEvents());
+ Level.FINEST,
+ "Returning Report With Event::" + aEvType + " For Component:::"
+ + prEvent.getComponentName() + " Duration:::"
+ + prEvent.getDurationExcludingSubEvents());
}
}
}
@@ -211,7 +211,7 @@
* @throws ConfigurationException
*/
private static ConfigurableFeature getConfigurableFeature(Node entityNode)
- throws ConfigurationException // SITHException
+ throws ConfigurationException // SITHException
{
ConfigurableFeature featureStructure = null;
try {
@@ -311,8 +311,8 @@
public static File findDeployDirectory(String aServiceName) throws Exception {
if (aServiceName == null) {
throw new Exception(CpmLocalizedMessage.getLocalizedMessage(CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_EXP_service_not_defined__WARNING", new Object[] {
- Thread.currentThread().getName(), "NULL" }));
+ "UIMA_CPM_EXP_service_not_defined__WARNING", new Object[] {
+ Thread.currentThread().getName(), "NULL" }));
}
File[] dirList = getDirectories();
@@ -320,7 +320,7 @@
for (int i = 0; dirList != null && i < dirList.length; i++) {
String taeDescriptor = dirList[i].getAbsolutePath() + System.getProperty("file.separator")
- + "bin" + System.getProperty("file.separator") + "desc.xml";
+ + "bin" + System.getProperty("file.separator") + "desc.xml";
Descriptor descriptor = null;
try {
descriptor = new Descriptor(taeDescriptor);
@@ -349,8 +349,8 @@
File rootDir = new File(rootPath, appRoot);
if (rootDir.isDirectory() == false) {
throw new Exception(CpmLocalizedMessage.getLocalizedMessage(CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_EXP_not_directory__WARNING", new Object[] {
- Thread.currentThread().getName(), appRoot }));
+ "UIMA_CPM_EXP_not_directory__WARNING", new Object[] {
+ Thread.currentThread().getName(), appRoot }));
}
String[] list = rootDir.list();
String currentFile;
@@ -359,7 +359,7 @@
for (int i = 0; i < list.length; i++) {
currentFile = list[i];
aFile = new File(rootDir.getAbsolutePath() + System.getProperty("file.separator")
- + currentFile);
+ + currentFile);
if (aFile.isDirectory()) {
dirList.add(aFile);
}
@@ -373,7 +373,7 @@
public static int getFeatureAsInt(CAS aCas, Feature aFeature, String aName) throws Exception {
Feature seqNo2 = aFeature.getRange().getFeatureByBaseName(aName);
FeatureStructure documentMetaData = aCas.getView(CAS.NAME_DEFAULT_SOFA).getDocumentAnnotation()
- .getFeatureValue(aFeature);
+ .getFeatureValue(aFeature);
return documentMetaData.getIntValue(seqNo2);
}
@@ -389,10 +389,10 @@
* @return - value as String
*/
public static String getFeatureAsString(CAS aCas, Feature aFeature, String aName)
- throws Exception {
+ throws Exception {
Feature seqNo2 = aFeature.getRange().getFeatureByBaseName(aName);
FeatureStructure documentMetaData = aCas.getView(CAS.NAME_DEFAULT_SOFA).getDocumentAnnotation()
- .getFeatureValue(aFeature);
+ .getFeatureValue(aFeature);
return documentMetaData.getStringValue(seqNo2);
}
@@ -406,7 +406,7 @@
*/
public static synchronized ChunkMetadata getChunkMetadata(CAS aCas) {
Feature feat = aCas.getTypeSystem().getFeatureByFullName(
- "uima.tcas.DocumentAnnotation:esDocumentMetaData");
+ "uima.tcas.DocumentAnnotation:esDocumentMetaData");
if (feat != null) {
try {
int sequenceNo = getFeatureAsInt(aCas, feat, ChunkMetadata.SEQUENCE); // "sequenceNumber");
@@ -416,14 +416,13 @@
String url = getFeatureAsString(aCas, feat, ChunkMetadata.DOCUMENTURL); // "isCompleted");
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(CPMUtils.class).log(
- Level.FINEST,
- Thread.currentThread().getName() + "===========================>SeqNo::"
- + sequenceNo + " docId::" + docId + " isComplete::"
- + isCompleted + " ThrottleID:" + throttleID
- + " Document URL:" + url);
+ Level.FINEST,
+ Thread.currentThread().getName() + "===========================>SeqNo::"
+ + sequenceNo + " docId::" + docId + " isComplete::" + isCompleted
+ + " ThrottleID:" + throttleID + " Document URL:" + url);
}
ChunkMetadata cm = new ChunkMetadata(String.valueOf(docId), sequenceNo,
- isCompleted == 1 ? true : false);
+ isCompleted == 1 ? true : false);
if (throttleID != null && throttleID.trim().length() > 0) {
cm.setThrottleID(throttleID);
}
@@ -434,16 +433,16 @@
} catch (NullPointerException e) {
if (UIMAFramework.getLogger().isLoggable(Level.WARNING)) {
Exception newE = new CPMException(
- "Possible misconfiguration. CPM configured to use chunking but chunk metadata is not present in the CAS. Check if the CAS has been properly initialized by the CollectionReader.");
+ "Possible misconfiguration. CPM configured to use chunking but chunk metadata is not present in the CAS. Check if the CAS has been properly initialized by the CollectionReader.");
UIMAFramework.getLogger(CPMUtils.class).log(Level.WARNING,
- Thread.currentThread().getName(), newE);
+ Thread.currentThread().getName(), newE);
}
}
catch (Exception e) {
if (UIMAFramework.getLogger().isLoggable(Level.WARNING)) {
UIMAFramework.getLogger(CPMUtils.class).log(Level.WARNING,
- Thread.currentThread().getName(), e);
+ Thread.currentThread().getName(), e);
}
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CasMetaData.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CasMetaData.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CasMetaData.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CasMetaData.java Tue Nov 28 14:22:38 2006
@@ -47,9 +47,8 @@
} else {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
- "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_cas_not_valid__FINEST",
- new Object[] { Thread.currentThread().getName() });
+ "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_cas_not_valid__FINEST",
+ new Object[] { Thread.currentThread().getName() });
}
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CpmLocalizedMessage.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CpmLocalizedMessage.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CpmLocalizedMessage.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CpmLocalizedMessage.java Tue Nov 28 14:22:38 2006
@@ -26,7 +26,7 @@
public class CpmLocalizedMessage {
public static String getLocalizedMessage(String aResourceBundleName, String aMessageKey,
- Object[] aArguments) {
+ Object[] aArguments) {
if (aMessageKey == null)
return null;
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ExpirationTimer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ExpirationTimer.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ExpirationTimer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ExpirationTimer.java Tue Nov 28 14:22:38 2006
@@ -67,14 +67,9 @@
if (map.containsKey(key)) {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
- UIMAFramework.getLogger(this.getClass()).logrb(
- Level.FINEST,
- this.getClass().getName(),
- "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_timer_expired__FINEST",
- new Object[] { Thread.currentThread().getName(), key,
- String.valueOf(map.size()) });
+ UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
+ "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_timer_expired__FINEST",
+ new Object[] { Thread.currentThread().getName(), key, String.valueOf(map.size()) });
}
synchronized (map) {
map.remove(key);
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Filter.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Filter.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Filter.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Filter.java Tue Nov 28 14:22:38 2006
@@ -69,8 +69,8 @@
}
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
- "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_expression__FINEST",
- new Object[] { Thread.currentThread().getName(), sb.toString() });
+ "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_expression__FINEST",
+ new Object[] { Thread.currentThread().getName(), sb.toString() });
}
sb.setLength(0);
@@ -224,8 +224,8 @@
// supported
if (filter.isAndFilter) {
throw new ParseException(
- "Filter.Expression.setIsOrFilter()-Mixing <AND> and <OR> currently not supported. Choose one conjunction <AND> or disjunction <OR> in your filter.",
- 0);
+ "Filter.Expression.setIsOrFilter()-Mixing <AND> and <OR> currently not supported. Choose one conjunction <AND> or disjunction <OR> in your filter.",
+ 0);
}
filter.isOrFilter = true;
filter.filterInitialized = true;
@@ -236,8 +236,8 @@
// supported
if (filter.filterInitialized && filter.isOrFilter) {
throw new ParseException(
- "Filter.Expression.setIsOrFilter()-Mixing <AND> and <OR> currently not supported. Choose one conjunction <AND> or disjunction <OR> in your filter.",
- 0);
+ "Filter.Expression.setIsOrFilter()-Mixing <AND> and <OR> currently not supported. Choose one conjunction <AND> or disjunction <OR> in your filter.",
+ 0);
}
filter.isAndFilter = true;
filter.isOrFilter = false; // turnoff default
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/TimerFactory.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/TimerFactory.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/TimerFactory.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/TimerFactory.java Tue Nov 28 14:22:38 2006
@@ -45,9 +45,8 @@
} catch (Exception e) {
if (UIMAFramework.getLogger().isLoggable(Level.CONFIG)) {
UIMAFramework.getLogger(TimerFactory.class).logrb(Level.CONFIG,
- TimerFactory.class.getName(), "initialize",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_java_timer__CONFIG",
- new Object[] { Thread.currentThread().getName() });
+ TimerFactory.class.getName(), "initialize", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_java_timer__CONFIG", new Object[] { Thread.currentThread().getName() });
}
timer = new JavaTimer();
}
@@ -62,9 +61,8 @@
if (timer == null) {
if (UIMAFramework.getLogger().isLoggable(Level.CONFIG)) {
UIMAFramework.getLogger(TimerFactory.class).logrb(Level.CONFIG,
- TimerFactory.class.getName(), "initialize",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_java_timer__CONFIG",
- new Object[] { Thread.currentThread().getName() });
+ TimerFactory.class.getName(), "initialize", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_java_timer__CONFIG", new Object[] { Thread.currentThread().getName() });
}
timer = new JavaTimer();
}
@@ -91,35 +89,30 @@
if (anObject instanceof UimaTimer) {
timer = (UimaTimer) anObject;
if (UIMAFramework.getLogger().isLoggable(Level.CONFIG)) {
- UIMAFramework.getLogger(TimerFactory.class).logrb(
- Level.CONFIG,
- TimerFactory.class.getName(),
- "initialize",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_show_timer_class__CONFIG",
- new Object[] { Thread.currentThread().getName(),
- timer.getClass().getName() });
+ UIMAFramework.getLogger(TimerFactory.class).logrb(Level.CONFIG,
+ TimerFactory.class.getName(), "initialize", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_show_timer_class__CONFIG",
+ new Object[] { Thread.currentThread().getName(), timer.getClass().getName() });
}
return;
}
} catch (ClassNotFoundException e) {
throw new ResourceInitializationException(ResourceInitializationException.CLASS_NOT_FOUND,
- new Object[] { aClassName, "CPE" }, e);
+ new Object[] { aClassName, "CPE" }, e);
} catch (IllegalAccessException e) {
throw new ResourceInitializationException(
- ResourceInitializationException.COULD_NOT_INSTANTIATE, new Object[] {
- aClassName, "CPE" }, e);
+ ResourceInitializationException.COULD_NOT_INSTANTIATE, new Object[] { aClassName,
+ "CPE" }, e);
} catch (InstantiationException e) {
throw new ResourceInitializationException(
- ResourceInitializationException.COULD_NOT_INSTANTIATE, new Object[] {
- aClassName, "CPE" }, e);
+ ResourceInitializationException.COULD_NOT_INSTANTIATE, new Object[] { aClassName,
+ "CPE" }, e);
}
if (UIMAFramework.getLogger().isLoggable(Level.CONFIG)) {
UIMAFramework.getLogger(TimerFactory.class).logrb(Level.CONFIG,
- TimerFactory.class.getName(), "initialize",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_java_timer__CONFIG",
- new Object[] { Thread.currentThread().getName() });
+ TimerFactory.class.getName(), "initialize", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_java_timer__CONFIG", new Object[] { Thread.currentThread().getName() });
}
timer = new JavaTimer();
}
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/TypeComplianceConverterImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/TypeComplianceConverterImpl.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/TypeComplianceConverterImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/TypeComplianceConverterImpl.java Tue Nov 28 14:22:38 2006
@@ -59,10 +59,10 @@
public static void main(String[] args) {
System.out.println(TypeComplianceConverterImpl.replace("Detag_colon_DetagContent", "_colon_",
- ":"));
+ ":"));
System.out.println(TypeComplianceConverterImpl.replace("Detag:DetagContent", ":", "_colon_"));
System.out.println(TypeComplianceConverterImpl
- .replace("Detag_dash_DetagContent", "_dash_", "-"));
+ .replace("Detag_dash_DetagContent", "_dash_", "-"));
System.out.println(TypeComplianceConverterImpl.replace("Detag-DetagContent", "-", "_dash_"));
}
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/DATACasUtils.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/DATACasUtils.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/DATACasUtils.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/DATACasUtils.java Tue Nov 28 14:22:38 2006
@@ -65,7 +65,7 @@
* @param featureValue
*/
public static void addFeatureStructure(CasData dataCas, String featureType, String featureName,
- String featureValue) {
+ String featureValue) {
FeatureStructure vfs = new FeatureStructureImpl();
vfs.setType(featureType);
PrimitiveValue pv = new VinciPrimitiveValue(featureValue);
@@ -94,7 +94,7 @@
* @param featureValue
*/
public static void addFeature(CasData dataCas, String featureType, String featureName,
- String featureValue) {
+ String featureValue) {
Iterator it = dataCas.getFeatureStructures();
while (it.hasNext()) {
FeatureStructure fs = (FeatureStructure) it.next();
@@ -149,9 +149,9 @@
// this case, the feature MUST be null.
if ((filterExpression.getOperand() == null && featureValue == null || featureValue.trim()
- .length() == 0)
- || // this means that the feature must exist in CAS
- ("!".equals(filterExpression.getOperand().getOperand()) && featureValue != null) // this
+ .length() == 0)
+ || // this means that the feature must exist in CAS
+ ("!".equals(filterExpression.getOperand().getOperand()) && featureValue != null) // this
// means
// that
// the
@@ -191,7 +191,7 @@
*/
public static boolean dropIt(String aKey, String[] dropKeyList) {
for (int i = 0; aKey != null && dropKeyList != null && i < dropKeyList.length
- && dropKeyList[i] != null; i++) {
+ && dropKeyList[i] != null; i++) {
if (dropKeyList[i].equals(aKey)) {
return true;
}
@@ -209,13 +209,13 @@
if (aKey.indexOf(org.apache.uima.collection.impl.cpm.Constants.SHORT_DASH_TERM) > -1) {
aKey = StringUtils.replaceAll(aKey,
- org.apache.uima.collection.impl.cpm.Constants.SHORT_DASH_TERM,
- org.apache.uima.collection.impl.cpm.Constants.LONG_DASH_TERM);
+ org.apache.uima.collection.impl.cpm.Constants.SHORT_DASH_TERM,
+ org.apache.uima.collection.impl.cpm.Constants.LONG_DASH_TERM);
}
if (aKey.indexOf(org.apache.uima.collection.impl.cpm.Constants.SHORT_COLON_TERM) > -1) {
aKey = StringUtils.replaceAll(aKey,
- org.apache.uima.collection.impl.cpm.Constants.SHORT_COLON_TERM,
- org.apache.uima.collection.impl.cpm.Constants.LONG_COLON_TERM);
+ org.apache.uima.collection.impl.cpm.Constants.SHORT_COLON_TERM,
+ org.apache.uima.collection.impl.cpm.Constants.LONG_COLON_TERM);
}
for (int i = 0; aKey != null && typeList != null && i < typeList.length && typeList[i] != null; i++) {
@@ -260,7 +260,7 @@
if (object instanceof FeatureStructure) {
FeatureStructure fs = (FeatureStructure) object;
String type = StringUtils.replaceAll(fs.getType(), Constants.LONG_COLON_TERM,
- Constants.SHORT_COLON_TERM);
+ Constants.SHORT_COLON_TERM);
if (type.equals(aName)) {
return true;
}
@@ -281,9 +281,9 @@
FeatureStructure fs = (FeatureStructure) object;
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(DATACasUtils.class).logrb(Level.FINEST,
- DATACasUtils.class.getName(), "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_show_cas_fs_type__FINEST",
- new Object[] { Thread.currentThread().getName(), fs.getType() });
+ DATACasUtils.class.getName(), "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_show_cas_fs_type__FINEST",
+ new Object[] { Thread.currentThread().getName(), fs.getType() });
}
String[] names = fs.getFeatureNames();
@@ -291,7 +291,8 @@
FeatureValue fValue = fs.getFeatureValue(names[i]);
if (fValue != null) {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
- UIMAFramework.getLogger(DATACasUtils.class).logrb(
+ UIMAFramework.getLogger(DATACasUtils.class)
+ .logrb(
Level.FINEST,
DATACasUtils.class.getName(),
"process",
@@ -321,27 +322,19 @@
if (object instanceof FeatureStructure) {
FeatureStructure fs = (FeatureStructure) object;
if (System.getProperty("SHOWFEATURES") != null) {
- UIMAFramework.getLogger(DATACasUtils.class).logrb(
- Level.FINEST,
- DATACasUtils.class.getName(),
- "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_search_cas_by_value__FINEST",
- new Object[] { Thread.currentThread().getName(), featureName,
- fs.getType() });
+ UIMAFramework.getLogger(DATACasUtils.class).logrb(Level.FINEST,
+ DATACasUtils.class.getName(), "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_search_cas_by_value__FINEST",
+ new Object[] { Thread.currentThread().getName(), featureName, fs.getType() });
}
if (featureName.equals(fs.getType())) {
String[] names = fs.getFeatureNames();
for (int i = 0; names != null && i < names.length; i++) {
if (System.getProperty("SHOWFEATURES") != null) {
- UIMAFramework.getLogger(DATACasUtils.class).logrb(
- Level.FINEST,
- DATACasUtils.class.getName(),
- "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_show_type_value__FINEST",
- new Object[] { Thread.currentThread().getName(), names[i],
- fs.getType() });
+ UIMAFramework.getLogger(DATACasUtils.class).logrb(Level.FINEST,
+ DATACasUtils.class.getName(), "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_show_type_value__FINEST",
+ new Object[] { Thread.currentThread().getName(), names[i], fs.getType() });
}
}
@@ -379,7 +372,7 @@
* @return
*/
public static String[] getFeatureStructureValues(CasData aCAS, String featureStructureName,
- String featureName) {
+ String featureName) {
Iterator it = aCAS.getFeatureStructures();
String featureValue = null;
Vector v = new Vector();
@@ -415,7 +408,7 @@
* @return
*/
public static String getFeatureValueByType(CasData aCAS, String aFeatureStructure,
- String featureName) {
+ String featureName) {
Iterator it = aCAS.getFeatureStructures();
String featureValue = null;
while (it.hasNext()) {
@@ -479,7 +472,7 @@
while (it.hasNext()) {
Object object = it.next();
if (object instanceof FeatureStructure
- && ((FeatureStructure) object).getType().equals(aFeatureStructureName)) {
+ && ((FeatureStructure) object).getType().equals(aFeatureStructureName)) {
FeatureStructure fs = (FeatureStructure) object;
String[] featureNames = fs.getFeatureNames();
if (featureNames == null) {
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/Vinci.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/Vinci.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/Vinci.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/Vinci.java Tue Nov 28 14:22:38 2006
@@ -91,7 +91,7 @@
* @return {@link org.apache.vinci.transport.VinciFrame} VinciData frame.
*/
public static AFrame replyWithAnalysis(VinciClient conn, VinciFrame requestFrame)
- throws Exception {
+ throws Exception {
AFFactory af = new AFFactory();
return (AFrame) conn.sendAndReceive(requestFrame, af);
}
@@ -118,7 +118,7 @@
String frameAsString = frame.toXML();
if (frameAsString.indexOf("KEYS") > -1 && frameAsString.indexOf("</KEYS>") > -1) {
keys = frameAsString.substring(frameAsString.indexOf("KEYS") + 5, frameAsString
- .indexOf("</KEYS>"));
+ .indexOf("</KEYS>"));
}
return keys;
}
@@ -146,8 +146,8 @@
FeatureStructure fs = (FeatureStructure) it.next();
if (org.apache.uima.collection.impl.cpm.Constants.CONTENT_TAG.equals(fs.getType())) {
return ((PrimitiveValue) fs
- .getFeatureValue(org.apache.uima.collection.impl.cpm.Constants.CONTENT_TAG_VALUE))
- .toString();
+ .getFeatureValue(org.apache.uima.collection.impl.cpm.Constants.CONTENT_TAG_VALUE))
+ .toString();
}
}
return "";
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorConfigurationParameterSettingsImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorConfigurationParameterSettingsImpl.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorConfigurationParameterSettingsImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorConfigurationParameterSettingsImpl.java Tue Nov 28 14:22:38 2006
@@ -26,7 +26,7 @@
import org.apache.uima.resource.metadata.ConfigurationParameterSettings;
public class CasProcessorConfigurationParameterSettingsImpl implements
- CasProcessorConfigurationParameterSettings {
+ CasProcessorConfigurationParameterSettings {
private NameValuePair[] params = new NameValuePair[0];
private ArrayList paramList = new ArrayList(0);
@@ -43,7 +43,7 @@
}
for (int i = 0; i < size; i++) {
paramList.add(new NameValuePairImpl(aCps.getParameterSettings()[i].getName(), aCps
- .getParameterSettings()[i].getValue()));
+ .getParameterSettings()[i].getValue()));
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorCpeObject.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorCpeObject.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorCpeObject.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorCpeObject.java Tue Nov 28 14:22:38 2006
@@ -112,9 +112,8 @@
}
}
throw new CpeDescriptorException(CpmLocalizedMessage.getLocalizedMessage(
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_Exception_invalid_deployment__WARNING", new Object[] {
- Thread.currentThread().getName(), "", aDeployMode }));
+ CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_Exception_invalid_deployment__WARNING",
+ new Object[] { Thread.currentThread().getName(), "", aDeployMode }));
}
/**
@@ -136,7 +135,7 @@
public void setDescriptor(String aDescriptorPath) throws CpeDescriptorException {
if (descriptor == null) {
CpeComponentDescriptor comp_desc = CpeDescriptorFactory
- .produceComponentDescriptor(aDescriptorPath);
+ .produceComponentDescriptor(aDescriptorPath);
this.setCpeComponentDescriptor(comp_desc);
} else {
descriptor.getInclude().set(aDescriptorPath);
@@ -194,13 +193,13 @@
if (filter != null) {
if (filterString.indexOf(org.apache.uima.collection.impl.cpm.Constants.SHORT_COLON_TERM) > -1) {
filterString = StringUtils.replaceAll(filterString,
- org.apache.uima.collection.impl.cpm.Constants.SHORT_COLON_TERM,
- org.apache.uima.collection.impl.cpm.Constants.LONG_COLON_TERM);
+ org.apache.uima.collection.impl.cpm.Constants.SHORT_COLON_TERM,
+ org.apache.uima.collection.impl.cpm.Constants.LONG_COLON_TERM);
}
if (filterString.indexOf(org.apache.uima.collection.impl.cpm.Constants.LONG_DASH_TERM) > -1) {
filterString = StringUtils.replaceAll(filterString,
- org.apache.uima.collection.impl.cpm.Constants.SHORT_DASH_TERM,
- org.apache.uima.collection.impl.cpm.Constants.LONG_DASH_TERM);
+ org.apache.uima.collection.impl.cpm.Constants.SHORT_DASH_TERM,
+ org.apache.uima.collection.impl.cpm.Constants.LONG_DASH_TERM);
}
}
return filterString;
@@ -218,7 +217,7 @@
}
if (getErrorHandling() == null) {
CasProcessorErrorHandling errorHandling = CpeDescriptorFactory
- .produceCasProcessorErrorHandling();
+ .produceCasProcessorErrorHandling();
CasProcessorMaxRestarts maxRestart = CpeDescriptorFactory.produceCasProcessorMaxRestarts();
maxRestart.setRestartCount(30);
maxRestart.setAction("terminate");
@@ -227,7 +226,7 @@
timeout.set(100000);
errorHandling.setTimeout(timeout);
CasProcessorErrorRateThreshold errorThreshold = CpeDescriptorFactory
- .produceCasProcessorErrorRateThreshold();
+ .produceCasProcessorErrorRateThreshold();
errorThreshold.setMaxErrorCount(100);
errorThreshold.setMaxErrorSampleSize(1000);
errorThreshold.setAction("terminate");
@@ -309,7 +308,7 @@
}
if (!found) {
deploymentParameters.add(new CasProcessorDeploymentParamImpl(aParamName, aParamValue,
- "string"));
+ "string"));
}
}
@@ -319,7 +318,7 @@
* @throws CpeDescriptorException
*/
protected void setDeploymentParams(CasProcessorDeploymentParams aParams)
- throws CpeDescriptorException {
+ throws CpeDescriptorException {
deploymentParameters = aParams;
}
@@ -345,8 +344,8 @@
if (aName == null || aName.trim().length() == 0) {
throw new CpeDescriptorException(CpmLocalizedMessage.getLocalizedMessage(
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_EXP_invalid_reference__WARNING",
- new Object[] { Thread.currentThread().getName(), "casProcessor name=NULL" }));
+ CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_EXP_invalid_reference__WARNING",
+ new Object[] { Thread.currentThread().getName(), "casProcessor name=NULL" }));
}
name = aName;
}
@@ -392,7 +391,7 @@
* @see org.apache.uima.collection.metadata.CpeCasProcessor#setDescriptorPath(java.lang.String)
*/
public void setCpeComponentDescriptor(CpeComponentDescriptor aDescriptor)
- throws CpeDescriptorException {
+ throws CpeDescriptorException {
descriptor = aDescriptor;
}
@@ -406,7 +405,7 @@
* @see org.apache.uima.collection.metadata.CpeCasProcessor#setErrorHandling(org.apache.uima.collection.metadata.CasProcessorErrorHandling)
*/
public void setErrorHandling(CasProcessorErrorHandling aErrorHandling)
- throws CpeDescriptorException {
+ throws CpeDescriptorException {
errorHandling = aErrorHandling;
}
@@ -617,17 +616,17 @@
* Sets configuration parameter settings for this CasProcessor.
*/
public void setConfigurationParameterSettings(CasProcessorConfigurationParameterSettings settings)
- throws CpeDescriptorException {
+ throws CpeDescriptorException {
configurationParameterSettings = settings;
if (settings != null && settings.getParameterSettings() != null) {
int length = settings.getParameterSettings().length;
if (length > 0) {
parameterSettings = new ConfigurationParameterSettings_impl();
org.apache.uima.resource.metadata.NameValuePair[] nvp = new NameValuePair_impl[settings
- .getParameterSettings().length];
+ .getParameterSettings().length];
for (int i = 0; i < settings.getParameterSettings().length; i++) {
nvp[i] = new NameValuePair_impl(settings.getParameterSettings()[i].getName(), settings
- .getParameterSettings()[i].getValue());
+ .getParameterSettings()[i].getValue());
}
parameterSettings.setParameterSettings(nvp);
}
@@ -650,7 +649,7 @@
parameterSettings = settings;
if (parameterSettings != null) {
configurationParameterSettings = new CasProcessorConfigurationParameterSettingsImpl(
- parameterSettings);
+ parameterSettings);
}
}
@@ -744,7 +743,7 @@
* org.apache.uima.util.XMLParser, org.apache.uima.util.XMLParser.ParsingOptions)
*/
public void buildFromXMLElement(Element aElement, XMLParser aParser, ParsingOptions aOptions)
- throws InvalidXMLException {
+ throws InvalidXMLException {
super.buildFromXMLElement(aElement, aParser, aOptions);
String field = "name";
try {
@@ -753,8 +752,8 @@
setDeployment(aElement.getAttribute("deployment"));
} catch (Exception e) {
throw new InvalidXMLException(CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_EXP_missing_attribute_from_xml_element__WARNING", new Object[] {
- Thread.currentThread().getName(), "casProcessor", field, "casProcessor" });
+ "UIMA_CPM_EXP_missing_attribute_from_xml_element__WARNING", new Object[] {
+ Thread.currentThread().getName(), "casProcessor", field, "casProcessor" });
}
}
@@ -778,14 +777,13 @@
}
static final private XmlizationInfo XMLIZATION_INFO = new XmlizationInfo("casProcessor",
- new PropertyXmlInfo[] { new PropertyXmlInfo("cpeComponentDescriptor", null),
- new PropertyXmlInfo("deploymentParameters", null),
- new PropertyXmlInfo("runInSeparateProcess", null),
- new PropertyXmlInfo("filter", null),
- new PropertyXmlInfo("errorHandling", null),
- new PropertyXmlInfo("checkpoint", null),
- new PropertyXmlInfo("sofaNameMappings", null),
- new PropertyXmlInfo("parameterSettings", null), });
+ new PropertyXmlInfo[] { new PropertyXmlInfo("cpeComponentDescriptor", null),
+ new PropertyXmlInfo("deploymentParameters", null),
+ new PropertyXmlInfo("runInSeparateProcess", null),
+ new PropertyXmlInfo("filter", null), new PropertyXmlInfo("errorHandling", null),
+ new PropertyXmlInfo("checkpoint", null),
+ new PropertyXmlInfo("sofaNameMappings", null),
+ new PropertyXmlInfo("parameterSettings", null), });
/**
* @return
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorDeploymentParamImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorDeploymentParamImpl.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorDeploymentParamImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorDeploymentParamImpl.java Tue Nov 28 14:22:38 2006
@@ -27,7 +27,7 @@
import org.xml.sax.helpers.AttributesImpl;
public class CasProcessorDeploymentParamImpl extends MetaDataObject_impl implements
- CasProcessorDeploymentParam {
+ CasProcessorDeploymentParam {
private static final long serialVersionUID = 8950620301535742630L;
private String name;
@@ -114,6 +114,6 @@
}
static final private XmlizationInfo XMLIZATION_INFO = new XmlizationInfo("parameter",
- new PropertyXmlInfo[0]);
+ new PropertyXmlInfo[0]);
}
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorDeploymentParamsImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorDeploymentParamsImpl.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorDeploymentParamsImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorDeploymentParamsImpl.java Tue Nov 28 14:22:38 2006
@@ -39,7 +39,7 @@
import org.xml.sax.helpers.AttributesImpl;
public class CasProcessorDeploymentParamsImpl extends MetaDataObject_impl implements
- CasProcessorDeploymentParams {
+ CasProcessorDeploymentParams {
private static final long serialVersionUID = 4871710283477856271L;
private ArrayList params = new ArrayList();
@@ -101,7 +101,7 @@
* org.apache.uima.util.XMLParser, org.apache.uima.util.XMLParser.ParsingOptions)
*/
public void buildFromXMLElement(Element aElement, XMLParser aParser, ParsingOptions aOptions)
- throws InvalidXMLException {
+ throws InvalidXMLException {
NodeList nodes = aElement.getChildNodes();
for (int i = 0; i < nodes.getLength(); i++) {
Node node = nodes.item(i);
@@ -116,14 +116,14 @@
}
// nodeMap.getNamedItem("type").getNodeValue();
CasProcessorDeploymentParam p = new CasProcessorDeploymentParamImpl(paramName, paramValue,
- paramType);
+ paramType);
params.add(p);
}
}
}
public void toXML(ContentHandler aContentHandler, boolean aWriteDefaultNamespaceAttribute)
- throws SAXException {
+ throws SAXException {
XmlizationInfo inf = getXmlizationInfo();
// write the element's start tag
@@ -142,7 +142,7 @@
// write child elements
for (int i = 0; i < params.size(); i++) {
((CasProcessorDeploymentParam) params.get(i)).toXML(aContentHandler,
- aWriteDefaultNamespaceAttribute);
+ aWriteDefaultNamespaceAttribute);
}
// end element
@@ -154,6 +154,6 @@
}
static final private XmlizationInfo XMLIZATION_INFO = new XmlizationInfo("deploymentParameters",
- new PropertyXmlInfo[] { new PropertyXmlInfo("parameter"), });
+ new PropertyXmlInfo[] { new PropertyXmlInfo("parameter"), });
}
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorErrorHandlingImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorErrorHandlingImpl.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorErrorHandlingImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorErrorHandlingImpl.java Tue Nov 28 14:22:38 2006
@@ -28,7 +28,7 @@
import org.apache.uima.resource.metadata.impl.XmlizationInfo;
public class CasProcessorErrorHandlingImpl extends MetaDataObject_impl implements
- CasProcessorErrorHandling {
+ CasProcessorErrorHandling {
private static final long serialVersionUID = 1677062861920690715L;
@@ -100,7 +100,7 @@
}
static final private XmlizationInfo XMLIZATION_INFO = new XmlizationInfo("errorHandling",
- new PropertyXmlInfo[] { new PropertyXmlInfo("errorRateThreshold", null),
- new PropertyXmlInfo("maxConsecutiveRestarts", null),
- new PropertyXmlInfo("timeout", null), });
+ new PropertyXmlInfo[] { new PropertyXmlInfo("errorRateThreshold", null),
+ new PropertyXmlInfo("maxConsecutiveRestarts", null),
+ new PropertyXmlInfo("timeout", null), });
}
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorErrorRateThresholdImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorErrorRateThresholdImpl.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorErrorRateThresholdImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorErrorRateThresholdImpl.java Tue Nov 28 14:22:38 2006
@@ -30,7 +30,7 @@
import org.xml.sax.helpers.AttributesImpl;
public class CasProcessorErrorRateThresholdImpl extends MetaDataObject_impl implements
- CasProcessorErrorRateThreshold {
+ CasProcessorErrorRateThreshold {
private static final long serialVersionUID = -9214395691914383261L;
private String value;
@@ -121,7 +121,7 @@
* org.apache.uima.util.XMLParser, org.apache.uima.util.XMLParser.ParsingOptions)
*/
public void buildFromXMLElement(Element aElement, XMLParser aParser, ParsingOptions aOptions)
- throws InvalidXMLException {
+ throws InvalidXMLException {
setAction(aElement.getAttribute("action"));
setValue(aElement.getAttribute("value"));
}
@@ -143,7 +143,7 @@
}
static final private XmlizationInfo XMLIZATION_INFO = new XmlizationInfo("errorRateThreshold",
- new PropertyXmlInfo[0]);
+ new PropertyXmlInfo[0]);
/**
* @return
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorExecArgImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorExecArgImpl.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorExecArgImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorExecArgImpl.java Tue Nov 28 14:22:38 2006
@@ -67,7 +67,7 @@
* org.apache.uima.util.XMLParser, org.apache.uima.util.XMLParser.ParsingOptions)
*/
public void buildFromXMLElement(Element aElement, XMLParser aParser, ParsingOptions aOptions)
- throws InvalidXMLException {
+ throws InvalidXMLException {
value = XMLUtils.getText(aElement);
}
@@ -76,10 +76,10 @@
}
static final private XmlizationInfo XMLIZATION_INFO = new XmlizationInfo("arg",
- new PropertyXmlInfo[0]);
+ new PropertyXmlInfo[0]);
public void toXML(ContentHandler aContentHandler, boolean aWriteDefaultNamespaceAttribute)
- throws SAXException {
+ throws SAXException {
XmlizationInfo inf = getXmlizationInfo();
// write the element's start tag
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorExecutableImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorExecutableImpl.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorExecutableImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorExecutableImpl.java Tue Nov 28 14:22:38 2006
@@ -39,7 +39,7 @@
import org.xml.sax.helpers.AttributesImpl;
public class CasProcessorExecutableImpl extends MetaDataObject_impl implements
- CasProcessorExecutable {
+ CasProcessorExecutable {
private static final long serialVersionUID = 6897788743141912586L;
private String executable;
@@ -147,7 +147,7 @@
* org.apache.uima.util.XMLParser, org.apache.uima.util.XMLParser.ParsingOptions)
*/
public void buildFromXMLElement(Element aElement, XMLParser aParser, ParsingOptions aOptions)
- throws InvalidXMLException {
+ throws InvalidXMLException {
// TODO Auto-generated method stub
setExecutable(aElement.getAttribute("executable"));
setDir(aElement.getAttribute("dir"));
@@ -159,12 +159,12 @@
if ("arg".equals(node.getNodeName())) {
// assumes all children are CasProcessor elements
CasProcessorExecArg arg = (CasProcessorExecArg) aParser.buildObject((Element) node,
- aOptions);
+ aOptions);
args.add(arg);
} else if ("env".equals(node.getNodeName())) {
// assumes all children are CasProcessor elements
CasProcessorRuntimeEnvParam env = (CasProcessorRuntimeEnvParam) aParser.buildObject(
- (Element) node, aOptions);
+ (Element) node, aOptions);
envs.add(env);
}
}
@@ -173,7 +173,7 @@
}
public void toXML(ContentHandler aContentHandler, boolean aWriteDefaultNamespaceAttribute)
- throws SAXException {
+ throws SAXException {
XmlizationInfo inf = getXmlizationInfo();
// write the element's start tag
@@ -191,7 +191,7 @@
// write child elements
for (int i = 0; i < envs.size(); i++) {
((CasProcessorRuntimeEnvParam) envs.get(i)).toXML(aContentHandler,
- aWriteDefaultNamespaceAttribute);
+ aWriteDefaultNamespaceAttribute);
}
CasProcessorExecArg[] argList = args.getAll();
// write child elements
@@ -223,7 +223,7 @@
}
static final private XmlizationInfo XMLIZATION_INFO = new XmlizationInfo("exec",
- new PropertyXmlInfo[] { new PropertyXmlInfo("arg"), new PropertyXmlInfo("env"), });
+ new PropertyXmlInfo[] { new PropertyXmlInfo("arg"), new PropertyXmlInfo("env"), });
/**
* @return
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorFilterImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorFilterImpl.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorFilterImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorFilterImpl.java Tue Nov 28 14:22:38 2006
@@ -55,13 +55,13 @@
* org.apache.uima.util.XMLParser, org.apache.uima.util.XMLParser.ParsingOptions)
*/
public void buildFromXMLElement(Element aElement, XMLParser aParser, ParsingOptions aOptions)
- throws InvalidXMLException {
+ throws InvalidXMLException {
filter = XMLUtils.getText(aElement);
}
public void toXML(ContentHandler aContentHandler, boolean aWriteDefaultNamespaceAttribute)
- throws SAXException {
+ throws SAXException {
XmlizationInfo inf = getXmlizationInfo();
// write the element's start tag
@@ -88,7 +88,7 @@
}
static final private XmlizationInfo XMLIZATION_INFO = new XmlizationInfo("filter",
- new PropertyXmlInfo[0]);
+ new PropertyXmlInfo[0]);
/**
* @return
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorMaxRestartsImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorMaxRestartsImpl.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorMaxRestartsImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorMaxRestartsImpl.java Tue Nov 28 14:22:38 2006
@@ -30,7 +30,7 @@
import org.xml.sax.helpers.AttributesImpl;
public class CasProcessorMaxRestartsImpl extends MetaDataObject_impl implements
- CasProcessorMaxRestarts {
+ CasProcessorMaxRestarts {
private static final long serialVersionUID = 2863741219504239020L;
private String value = "1";
@@ -99,7 +99,7 @@
* org.apache.uima.util.XMLParser, org.apache.uima.util.XMLParser.ParsingOptions)
*/
public void buildFromXMLElement(Element aElement, XMLParser aParser, ParsingOptions aOptions)
- throws InvalidXMLException {
+ throws InvalidXMLException {
setAction(aElement.getAttribute("action"));
setValue(aElement.getAttribute("value"));
@@ -124,7 +124,7 @@
attrs.addAttribute("", "value", "value", "CDATA", getValue());
if (getWaitTimeBetweenRetries() != 0) {
attrs.addAttribute("", "waitTimeBetweenRetries", "waitTimeBetweenRetries", "CDATA", String
- .valueOf(getWaitTimeBetweenRetries()));
+ .valueOf(getWaitTimeBetweenRetries()));
}
return attrs;
}
@@ -134,7 +134,7 @@
}
static final private XmlizationInfo XMLIZATION_INFO = new XmlizationInfo(
- "maxConsecutiveRestarts", new PropertyXmlInfo[0]);
+ "maxConsecutiveRestarts", new PropertyXmlInfo[0]);
/**
* @return
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorRunInSeperateProcessImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorRunInSeperateProcessImpl.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorRunInSeperateProcessImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorRunInSeperateProcessImpl.java Tue Nov 28 14:22:38 2006
@@ -26,7 +26,7 @@
import org.apache.uima.resource.metadata.impl.XmlizationInfo;
public class CasProcessorRunInSeperateProcessImpl extends MetaDataObject_impl implements
- CasProcessorRunInSeperateProcess {
+ CasProcessorRunInSeperateProcess {
private static final long serialVersionUID = 1074137401279020375L;
@@ -58,7 +58,7 @@
}
static final private XmlizationInfo XMLIZATION_INFO = new XmlizationInfo("runInSeparateProcess",
- new PropertyXmlInfo[] { new PropertyXmlInfo("exec", null), });
+ new PropertyXmlInfo[] { new PropertyXmlInfo("exec", null), });
/**
* @return
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorRuntimeEnvParamImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorRuntimeEnvParamImpl.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorRuntimeEnvParamImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorRuntimeEnvParamImpl.java Tue Nov 28 14:22:38 2006
@@ -31,7 +31,7 @@
import org.xml.sax.helpers.AttributesImpl;
public class CasProcessorRuntimeEnvParamImpl extends MetaDataObject_impl implements
- CasProcessorRuntimeEnvParam {
+ CasProcessorRuntimeEnvParam {
private static final long serialVersionUID = -6750487360818463790L;
private String key;
@@ -84,7 +84,7 @@
* org.apache.uima.util.XMLParser, org.apache.uima.util.XMLParser.ParsingOptions)
*/
public void buildFromXMLElement(Element aElement, XMLParser aParser, ParsingOptions aOptions)
- throws InvalidXMLException {
+ throws InvalidXMLException {
setKey(aElement.getAttribute("key"));
setValue(aElement.getAttribute("value"));
@@ -108,7 +108,7 @@
}
static final private XmlizationInfo XMLIZATION_INFO = new XmlizationInfo("env",
- new PropertyXmlInfo[0]);
+ new PropertyXmlInfo[0]);
/**
* @return
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorTimeoutImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorTimeoutImpl.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorTimeoutImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorTimeoutImpl.java Tue Nov 28 14:22:38 2006
@@ -64,7 +64,7 @@
* org.apache.uima.util.XMLParser, org.apache.uima.util.XMLParser.ParsingOptions)
*/
public void buildFromXMLElement(Element aElement, XMLParser aParser, ParsingOptions aOptions)
- throws InvalidXMLException {
+ throws InvalidXMLException {
setMax(aElement.getAttribute("max"));
setDefaultTimeout(aElement.getAttribute("default"));
}
@@ -88,7 +88,7 @@
}
static final private XmlizationInfo XMLIZATION_INFO = new XmlizationInfo("timeout",
- new PropertyXmlInfo[0]);
+ new PropertyXmlInfo[0]);
/**
* @return