ktlili 2005/07/11 12:03:17 CEST
Modified files:
war/src/java/com/jahia/clipping/Bean ClipperBean.java
war/src/java/com/jahia/clipping/database/hibernate
DatabaseManager.java
war/src/java/com/jahia/clipping/struts SelectPartAction.java
war/src/java/com/jahia/clipping/web/html ExtractorFilter.java
war/src/java/com/jahia/clipping/web/html/Impl/ExtractorFilter
ChewExtractorFilter.java
FormExtractorFilter.java
SimpleExtractorFilter.java
StringTreeExtractorFilter.java
Added files:
war/src/java/com/jahia/clipping/web/html/Impl/ExtractorFilter
AbsctractExtractoreFilter.java
Log:
- add multiple key behaviour to ExtratorFiltor
- add base class for all filters
Revision Changes Path
1.17 +1 -1
webclip_builder/war/src/java/com/jahia/clipping/Bean/ClipperBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/Bean/ClipperBean.java.diff?r1=1.16&r2=1.17&f=h
1.6 +1 -1
webclip_builder/war/src/java/com/jahia/clipping/database/hibernate/DatabaseManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/database/hibernate/DatabaseManager.java.diff?r1=1.5&r2=1.6&f=h
1.12 +1 -1
webclip_builder/war/src/java/com/jahia/clipping/struts/SelectPartAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/struts/SelectPartAction.java.diff?r1=1.11&r2=1.12&f=h
1.7 +2 -2
webclip_builder/war/src/java/com/jahia/clipping/web/html/ExtractorFilter.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/html/ExtractorFilter.java.diff?r1=1.6&r2=1.7&f=h
1.1 +35 -0
webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/ExtractorFilter/AbsctractExtractoreFilter.java
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/ExtractorFilter/AbsctractExtractoreFilter.java?rev=1.1&content-type=text/plain
1.2 +3 -3
webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/ExtractorFilter/ChewExtractorFilter.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/ExtractorFilter/ChewExtractorFilter.java.diff?r1=1.1&r2=1.2&f=h
1.2 +3 -3
webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/ExtractorFilter/FormExtractorFilter.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/ExtractorFilter/FormExtractorFilter.java.diff?r1=1.1&r2=1.2&f=h
1.2 +36 -19
webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/ExtractorFilter/SimpleExtractorFilter.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/ExtractorFilter/SimpleExtractorFilter.java.diff?r1=1.1&r2=1.2&f=h
1.2 +4 -4
webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/ExtractorFilter/StringTreeExtractorFilter.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/ExtractorFilter/StringTreeExtractorFilter.java.diff?r1=1.1&r2=1.2&f=h
Index: ClipperBean.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/Bean/ClipperBean.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ClipperBean.java 11 Jul 2005 09:49:13 -0000 1.16
+++ ClipperBean.java 11 Jul 2005 10:03:16 -0000 1.17
@@ -690,7 +690,7 @@
else {
//set the key of the filter
String key = parser.getFilterKey();
- filter.setKeyPart(key);
+ filter.addKeyPart(key);
// set the filter
setFilter(filter);
Index: DatabaseManager.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/database/hibernate/DatabaseManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DatabaseManager.java 11 Jul 2005 09:49:13 -0000 1.5
+++ DatabaseManager.java 11 Jul 2005 10:03:16 -0000 1.6
@@ -95,7 +95,7 @@
//set the key of the filter
String key = cBean.getFilterKey();
- filter.setKeyPart(key);
+ filter.addKeyPart(key);
// set the filter
cBean.setFilter(filter);
Index: SelectPartAction.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/struts/SelectPartAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SelectPartAction.java 11 Jul 2005 09:49:13 -0000 1.11
+++ SelectPartAction.java 11 Jul 2005 10:03:16 -0000 1.12
@@ -162,7 +162,7 @@
ExtractorFilter filter = new
ChewExtractorFilter(hashSelectedPart);
//set the key of the filter
String key = hashSelectedPart;
- filter.setKeyPart(key);
+ filter.addKeyPart(key);
// set the filter
bean.setFilter(filter);
Index: ExtractorFilter.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/html/ExtractorFilter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ExtractorFilter.java 11 Jul 2005 09:49:14 -0000 1.6
+++ ExtractorFilter.java 11 Jul 2005 10:03:16 -0000 1.7
@@ -21,7 +21,7 @@
*
[EMAIL PROTECTED] The KeyPart value
*/
- abstract String getKeyPart();
+ abstract String getKeyPart(String name);
/**
@@ -29,7 +29,7 @@
*
[EMAIL PROTECTED] key The new KeyPart value
*/
- abstract void setKeyPart(String key);
+ abstract void addKeyPart(String name, String value);
/**
Index: AbsctractExtractoreFilter.java
====================================================================
package com.jahia.clipping.web.html.Impl.ExtractorFilter;
import com.jahia.clipping.web.html.*;
import java.util.*;
/**
* Description of the Class
*
[EMAIL PROTECTED] Tlili Khaled
*/
public abstract class AbsctractExtractoreFilter implements ExtractorFilter {
private Hashtable map = new Hashtable();
/**
* Gets the KeyValue attribute of the AbsctractExtractoreFilter object
*
[EMAIL PROTECTED] name Description of Parameter
[EMAIL PROTECTED] The KeyValue value
*/
public String getKeyPart(String name) {
return (String) map.get(name);
}
/**
* Adds a feature to the Key attribute of the AbsctractExtractoreFilter
* object
*
[EMAIL PROTECTED] name The feature to be added to the Key attribute
[EMAIL PROTECTED] value The feature to be added to the Key attribute
*/
public void addKeyPart(String name, String value) {
map.put(name, value);
}
}
Index: ChewExtractorFilter.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/ExtractorFilter/ChewExtractorFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChewExtractorFilter.java 11 Jul 2005 09:49:15 -0000 1.1
+++ ChewExtractorFilter.java 11 Jul 2005 10:03:17 -0000 1.2
@@ -10,7 +10,7 @@
*
[EMAIL PROTECTED] Tlili Khaled
*/
-public class ChewExtractorFilter implements ExtractorFilter {
+public class ChewExtractorFilter extends AbsctractExtractoreFilter {
private String key;
private int mode;
/**
@@ -40,7 +40,7 @@
*/
public ChewExtractorFilter(String tableId) {
String key = tableId;
- setKeyPart(key);
+ addKeyPart(key);
}
@@ -50,7 +50,7 @@
*
[EMAIL PROTECTED] key The new Key value
*/
- public void setKeyPart(String key) {
+ public void addKeyPart(String key) {
this.key = key;
}
Index: FormExtractorFilter.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/ExtractorFilter/FormExtractorFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FormExtractorFilter.java 11 Jul 2005 09:49:15 -0000 1.1
+++ FormExtractorFilter.java 11 Jul 2005 10:03:17 -0000 1.2
@@ -14,7 +14,7 @@
*
[EMAIL PROTECTED] Tlili Khaled
*/
-public class FormExtractorFilter implements ExtractorFilter {
+public class FormExtractorFilter extends AbsctractExtractoreFilter {
private String key;
private int mode;
private final String NAME = "FormExtractorFilter";
@@ -38,7 +38,7 @@
*/
public FormExtractorFilter(String name, String id, int position) {
String key = buildKey(name, id, position);
- this.setKeyPart(key);
+ this.addKeyPart(key);
}
@@ -47,7 +47,7 @@
*
[EMAIL PROTECTED] key The new Key value
*/
- public void setKeyPart(String key) {
+ public void addKeyPart(String key) {
this.key = key;
}
Index: SimpleExtractorFilter.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/ExtractorFilter/SimpleExtractorFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleExtractorFilter.java 11 Jul 2005 09:49:15 -0000 1.1
+++ SimpleExtractorFilter.java 11 Jul 2005 10:03:17 -0000 1.2
@@ -7,10 +7,10 @@
*
[EMAIL PROTECTED] Tlili Khaled
*/
-public class SimpleExtractorFilter implements ExtractorFilter {
+public class SimpleExtractorFilter extends AbsctractExtractoreFilter {
private String selectedPart;
- private int mode;
- private final String NAME = "SimpleExtractorFilter";
+ private int mode;
+ private final String NAME = "SimpleExtractorFilter";
/**
@@ -19,7 +19,7 @@
[EMAIL PROTECTED] key Description of Parameter
*/
public SimpleExtractorFilter(String key) {
- setKeyPart(key);
+ addKeyPart(key);
}
@@ -40,24 +40,25 @@
this.selectedPart = selectedPart;
}
- public void setMode(int mode) {
- this.mode = mode;
- }
-
- /**
- * Sets the Key attribute of the SimpleHTMLFilter object
+ /**
+ * Sets the Mode attribute of the SimpleExtractorFilter object
*
- [EMAIL PROTECTED] key The new Key value
+ [EMAIL PROTECTED] mode The new Mode value
*/
- public void setKeyPart(String key) {
- this.setSelectedPart(key);
+ public void setMode(int mode) {
+ this.mode = mode;
}
- public String getName() {
- return NAME.toString();
- }
+ /**
+ * Gets the Name attribute of the SimpleExtractorFilter object
+ *
+ [EMAIL PROTECTED] The Name value
+ */
+ public String getName() {
+ return NAME.toString();
+ }
@@ -81,8 +82,24 @@
return selectedPart;
}
- public int getMode() {
- return mode;
- }
+
+ /**
+ * Gets the Mode attribute of the SimpleExtractorFilter object
+ *
+ [EMAIL PROTECTED] The Mode value
+ */
+ public int getMode() {
+ return mode;
+ }
+
+
+ /**
+ * Sets the Key attribute of the SimpleHTMLFilter object
+ *
+ [EMAIL PROTECTED] key The new Key value
+ */
+ public void addKeyPart(String key) {
+ this.setSelectedPart(key);
+ }
}
Index: StringTreeExtractorFilter.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/ExtractorFilter/StringTreeExtractorFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StringTreeExtractorFilter.java 11 Jul 2005 09:49:15 -0000 1.1
+++ StringTreeExtractorFilter.java 11 Jul 2005 10:03:17 -0000 1.2
@@ -17,11 +17,11 @@
import com.jahia.clipping.web.html.Impl.ExtractorFilter.util.*;
/**
- * JDom implementation of HTMLFilter
+ * String implementation of HTMLFilter
*
[EMAIL PROTECTED] Tlili Khaled
*/
-public class StringTreeExtractorFilter implements ExtractorFilter {
+public class StringTreeExtractorFilter extends AbsctractExtractoreFilter {
private int mode;
/**
* Description of the Method
@@ -74,7 +74,7 @@
*
[EMAIL PROTECTED] keyPart The new KeyPart value
*/
- public void setKeyPart(String keyPart) {
+ public void addKeyPart(String keyPart) {
this.keyPart = keyPart;
}
@@ -217,7 +217,7 @@
String key = visitor.getBuildedKey();
key = refactorKey(key);
- setKeyPart(key);
+ addKeyPart(key);
}
