unico 2004/09/29 08:11:38
Modified: src/share/org/apache/slide/extractor Tag:
SLIDE_2_1_RELEASE_BRANCH ExtractorManager.java
AbstractContentExtractor.java
AbstractPropertyExtractor.java
Log:
backward compatibility for third party extractors
Revision Changes Path
No revision
No revision
1.4.2.2 +11 -5
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.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- ExtractorManager.java 29 Sep 2004 15:01:26 -0000 1.4.2.1
+++ ExtractorManager.java 29 Sep 2004 15:11:38 -0000 1.4.2.2
@@ -111,8 +111,14 @@
try {
Class extractorClass = Class.forName(classname);
Extractor extractor = null;
- Constructor extractorConstructor =
extractorClass.getConstructor(new Class[] { String.class, String.class, String.class }
);
- extractor = (Extractor)extractorConstructor.newInstance(new
String[] { uri, contentType, namespace });
+ try {
+ Constructor extractorConstructor =
extractorClass.getConstructor(new Class[] { String.class, String.class, String.class }
);
+ extractor = (Extractor) extractorConstructor.newInstance(new
String[] { uri, contentType, namespace });
+ }
+ catch (NoSuchMethodException e) {
+ Constructor extractorConstructor =
extractorClass.getConstructor(new Class[] { String.class, String.class } );
+ extractor = (Extractor) extractorConstructor.newInstance(new
String[] { uri, contentType });
+ }
if ( extractor instanceof Configurable ) {
((Configurable)extractor).configure(extractorConfig.getConfiguration("configuration"));
}
1.3.2.2 +7 -3
jakarta-slide/src/share/org/apache/slide/extractor/AbstractContentExtractor.java
Index: AbstractContentExtractor.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/extractor/AbstractContentExtractor.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- AbstractContentExtractor.java 29 Sep 2004 15:01:26 -0000 1.3.2.1
+++ AbstractContentExtractor.java 29 Sep 2004 15:11:38 -0000 1.3.2.2
@@ -35,6 +35,10 @@
private String uri;
private String namespace;
+ public AbstractContentExtractor(String uri, String contentType) {
+ this(uri, contentType, null);
+ }
+
public AbstractContentExtractor(String uri, String contentType, String
namespace) {
this.contentType = contentType;
this.uri = uri;
1.2.2.2 +7 -3
jakarta-slide/src/share/org/apache/slide/extractor/AbstractPropertyExtractor.java
Index: AbstractPropertyExtractor.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/extractor/AbstractPropertyExtractor.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- AbstractPropertyExtractor.java 29 Sep 2004 15:01:26 -0000 1.2.2.1
+++ AbstractPropertyExtractor.java 29 Sep 2004 15:11:38 -0000 1.2.2.2
@@ -35,6 +35,10 @@
private String uri;
private String namespace;
+ public AbstractPropertyExtractor(String uri, String contentType) {
+ this(uri, contentType, null);
+ }
+
public AbstractPropertyExtractor(String uri, String contentType, String
namespace) {
this.contentType = contentType;
this.uri = uri;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
