luetzkendorf 2005/04/04 06:42:18
Modified: src/share/org/apache/slide/extractor ExtractorManager.java
PropertyExtractorTrigger.java
Log:
methods created an array from a newly created list, they now return the list
Revision Changes Path
1.8 +9 -12
jakarta-slide/src/share/org/apache/slide/extractor/ExtractorManager.java
Index: ExtractorManager.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/extractor/ExtractorManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ExtractorManager.java 14 Jan 2005 18:34:13 -0000 1.7
+++ ExtractorManager.java 4 Apr 2005 13:42:18 -0000 1.8
@@ -53,7 +53,7 @@
extractors.add(extractor);
}
- public PropertyExtractor[] getPropertyExtractors(String namespace,
NodeRevisionDescriptors descriptors, NodeRevisionDescriptor descriptor) {
+ public List getPropertyExtractors(String namespace,
NodeRevisionDescriptors descriptors, NodeRevisionDescriptor descriptor) {
List matchingExtractors = new ArrayList();
for ( Iterator i = extractors.iterator(); i.hasNext(); ) {
Extractor extractor = (Extractor)i.next();
@@ -61,11 +61,10 @@
matchingExtractors.add(extractor);
}
}
- PropertyExtractor[] extractors = new
PropertyExtractor[matchingExtractors.size()];
- return (PropertyExtractor [])matchingExtractors.toArray(extractors);
+ return matchingExtractors;
};
- public ContentExtractor[] getContentExtractors(String namespace,
NodeRevisionDescriptors descriptors, NodeRevisionDescriptor descriptor) {
+ public List getContentExtractors(String namespace,
NodeRevisionDescriptors descriptors, NodeRevisionDescriptor descriptor) {
List matchingExtractors = new ArrayList();
for ( Iterator i = extractors.iterator(); i.hasNext(); ) {
Extractor extractor = (Extractor)i.next();
@@ -73,8 +72,7 @@
matchingExtractors.add(extractor);
}
}
- ContentExtractor[] extractors = new
ContentExtractor[matchingExtractors.size()];
- return (ContentExtractor [])matchingExtractors.toArray(extractors);
+ return matchingExtractors;
};
public List getContentExtractors(String namespace, String uri,
NodeRevisionDescriptor descriptor) {
@@ -88,7 +86,7 @@
return matchingExtractors;
};
- public Extractor[] getExtractors(String namespace,
NodeRevisionDescriptors descriptors, NodeRevisionDescriptor descriptor) {
+ public List getExtractors(String namespace, NodeRevisionDescriptors
descriptors, NodeRevisionDescriptor descriptor) {
List matchingExtractors = new ArrayList();
for ( Iterator i = extractors.iterator(); i.hasNext(); ) {
Extractor extractor = (Extractor)i.next();
@@ -96,8 +94,7 @@
matchingExtractors.add(extractor);
}
}
- Extractor[] extractors = new Extractor[matchingExtractors.size()];
- return (Extractor [])matchingExtractors.toArray(extractors);
+ return matchingExtractors;
};
public boolean hasContentExtractor(String namespace,
1.8 +12 -8
jakarta-slide/src/share/org/apache/slide/extractor/PropertyExtractorTrigger.java
Index: PropertyExtractorTrigger.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/extractor/PropertyExtractorTrigger.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PropertyExtractorTrigger.java 21 Dec 2004 16:12:44 -0000 1.7
+++ PropertyExtractorTrigger.java 4 Apr 2005 13:42:18 -0000 1.8
@@ -25,8 +25,10 @@
import java.io.ByteArrayInputStream;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
+import org.apache.slide.common.Domain;
import org.apache.slide.common.PropertyName;
import org.apache.slide.content.NodeRevisionContent;
import org.apache.slide.content.NodeRevisionDescriptor;
@@ -50,9 +52,9 @@
NodeRevisionDescriptor descriptor =
event.getRevisionDescriptor();
NodeRevisionContent content = event.getRevisionContent();
if ( content != null && descriptor != null ) {
- PropertyExtractor[] extractor =
ExtractorManager.getInstance().getPropertyExtractors(namespaceName,
descriptors, descriptor);
- for ( int i = 0; i < extractor.length; i++ ) {
- Map extractedProperties = extractor[i].extract(new
ByteArrayInputStream(content.getContentBytes()));
+ List extractor =
ExtractorManager.getInstance().getPropertyExtractors(namespaceName,
descriptors, descriptor);
+ for ( int i = 0, l = extractor.size(); i < l; i++ ) {
+ Map extractedProperties =
((PropertyExtractor)extractor.get(i)).extract(new
ByteArrayInputStream(content.getContentBytes()));
for ( Iterator j =
extractedProperties.entrySet().iterator(); j.hasNext(); ) {
Map.Entry entry = (Map.Entry) j.next();
final Object key = entry.getKey();
@@ -66,7 +68,9 @@
}
}
} catch ( ExtractorException e ) {
- throw new VetoException(e.getMessage());
+ Domain.warn("Error while extracting properties for: " +
+ event.getRevisionDescriptors().getUri() + " ("
+ e + ")");
+ // TODO throw new VetoException(e.getMessage());
}
}
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
