Author: sshyrkov
Date: Mon Nov 19 16:37:39 2007
New Revision: 19224
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19224&repname=
=3Djahia
Log:
Cleanup deprecated API calls, unused local variables. Removed unused import=
statements.
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/ActiveXServerURLCleanupDOMVisitor.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/HtmlDOMVisitor.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/HtmlParser.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/JahiaTextContentTidy.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/NekoHtmlParser.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/TagRemover.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/TidyHtmlParser.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/ToRemoveMarkupSetting.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/htmlparser/ActiveXServerURLCleanupDOMVisitor.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/htmlparser/ActiveXServerURLCl=
eanupDOMVisitor.java&rev=3D19224&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/ActiveXServerURLCleanupDOMVisitor.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/ActiveXServerURLCleanupDOMVisitor.java Mon Nov 19 16:37:39 2007
@@ -19,7 +19,6 @@
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import java.util.ArrayList;
import org.w3c.dom.Element;
import java.util.Map;
import java.util.HashMap;
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/htmlparser/HtmlDOMVisitor.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/htmlparser/HtmlDOMVisitor.jav=
a&rev=3D19224&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/HtmlDOMVisitor.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/HtmlDOMVisitor.java Mon Nov 19 16:37:39 2007
@@ -16,8 +16,6 @@
* limitations under the License.
*/package org.jahia.services.htmlparser;
=
-import java.util.Set;
-
import org.w3c.dom.Document;
=
/**
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/htmlparser/HtmlParser.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/htmlparser/HtmlParser.java&re=
v=3D19224&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/HtmlParser.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/HtmlParser.java Mon Nov 19 16:37:39 2007
@@ -16,7 +16,6 @@
* limitations under the License.
*/package org.jahia.services.htmlparser;
=
-import java.util.Set;
import java.util.Vector;
=
/**
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/htmlparser/JahiaTextContentTidy.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/htmlparser/JahiaTextContentTi=
dy.java&rev=3D19224&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/JahiaTextContentTidy.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/JahiaTextContentTidy.java Mon Nov 19 16:37:39 2007
@@ -16,40 +16,7 @@
* limitations under the License.
*/package org.jahia.services.htmlparser;
=
-import java.io.*;
-import java.util.Properties;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Vector;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import org.apache.xalan.templates.OutputProperties;
-
-import org.xml.sax.EntityResolver;
-import org.xml.sax.SAXException;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.ProcessingInstruction;
-
-import org.w3c.tidy.*;
-
-import org.jahia.registries.ServicesRegistry;
import org.jahia.utils.JahiaTools;
-import org.jahia.utils.TextHtml;
=
/**
*
@@ -70,10 +37,6 @@
public static String NEW_LINE =3D "$$$nl$$$";
public static String WHITE_SPACE =3D "$$$ws$$$";
=
- private static org.apache.log4j.Logger logger =3D
- org.apache.log4j.Logger.getLogger (JahiaTextContentTidy.class);
-
-
/**
* Formats Jahia Text content before tidy processing
* @param input
@@ -119,98 +82,4 @@
return result.trim();
}
=
- /**
- * Jahia Specific, we take care to keep text indentation.
- * As Jahia automatically replace the "\n" by <br> in the Big Text con=
tent
- * entered through Jahia's Simple Text Editor.
- * We must keep track of those line break when generating processing it
- * with Tidy.
- *
- * @param str
- * @return
- */
- static private String encodeLineBreak (String str, boolean invert) {
- if (str =3D=3D null ) {
- return null;
- }
- StringBuffer result =3D new StringBuffer(str.length() + 500);
- String strLower =3D str.toLowerCase();
- int startOfIndex =3D 0;
- int i =3D strLower.indexOf(JAHIA_HTML_OPEN_TAG);
- while (i !=3D -1) {
- if ( !invert ){
- result.append(JahiaTools.replacePattern(str.substring(star=
tOfIndex,
- i), "\n", NEW_LINE));
- } else {
- result.append(JahiaTools.replacePattern(str.substring(star=
tOfIndex,
- i), NEW_LINE, "\n" ));
- }
- result.append(JAHIA_HTML_OPEN_TAG);
- startOfIndex =3D i + JAHIA_HTML_OPEN_TAG.length();
- i =3D strLower.indexOf(JAHIA_HTML_CLOSE_TAG, startOfIndex);
- if (i !=3D -1) {
- result.append(str.substring(startOfIndex, i));
- result.append(JAHIA_HTML_CLOSE_TAG);
- startOfIndex =3D i + JAHIA_HTML_CLOSE_TAG.length();
- }
- i =3D strLower.indexOf(JAHIA_HTML_OPEN_TAG, startOfIndex);
- }
- if ( !invert ){
- str =3D result.append(JahiaTools.replacePattern(str.substring(
- startOfIndex, str.length()), "\n", NEW_LINE)).toString=
();
- } else {
- str =3D result.append(JahiaTools.replacePattern(str.substring(
- startOfIndex, str.length()), NEW_LINE, "\n")).toString=
();
- }
- return str;
- }
-
- /**
- * Handle white space in textarea and tidy .
- * @param str
- * @return
- */
- static private String encodeTextAreaWhiteSpace (String str, boolean en=
code) {
- if (str =3D=3D null ) {
- return null;
- }
- try {
- StringBuffer result =3D new StringBuffer(str.length() + 500);
- String strLower =3D str.toLowerCase();
- String test =3D "";
- int startOfIndex =3D 0;
- int closeTagIndex =3D 0;
- int index =3D 0;
- int i =3D strLower.indexOf("<textarea");
- while (i !=3D -1) {
- i =3D strLower.substring(0, i).length() +
- strLower.substring(i).indexOf(">");
- result.append(str.substring(startOfIndex, i));
- test =3D result.toString();
- closeTagIndex =3D strLower.substring(0, i).length() +
- strLower.substring(i).indexOf("</textarea"=
);
- if ( encode ){
- result.append(JahiaTools.replacePattern(str.substring(=
i,
- closeTagIndex), " ", WHITE_SPACE));
- } else {
- String val =3D JahiaTools.replacePattern(str.substring=
(i,
- closeTagIndex), " ", "");
- result.append(JahiaTools.replacePattern(val, WHITE_SPA=
CE, " "));
- }
- test =3D result.toString();
- startOfIndex =3D closeTagIndex;
- index =3D strLower.substring(i).indexOf("<textarea");
- if ( index !=3D -1 ){
- i =3D strLower.substring(0, i).length() + index;
- } else {
- break;
- }
- }
- str =3D result.append(str.substring(startOfIndex)).toString();
- } catch ( Throwable t ){
- logger.debug("Error parsing text",t);
- }
- return str;
- }
-
}
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/htmlparser/NekoHtmlParser.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/htmlparser/NekoHtmlParser.jav=
a&rev=3D19224&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/NekoHtmlParser.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/NekoHtmlParser.java Mon Nov 19 16:37:39 2007
@@ -16,25 +16,22 @@
* limitations under the License.
*/package org.jahia.services.htmlparser;
=
-import org.apache.xalan.templates.OutputProperties;
-import org.apache.xml.serializer.OutputPropertiesFactory;
-import org.cyberneko.html.parsers.DOMParser;
-import org.jahia.utils.JahiaTools;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-import org.dom4j.io.XMLWriter;
-import org.dom4j.io.OutputFormat;
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStreamWriter;
+import java.io.StringReader;
+import java.util.Vector;
=
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.OutputStreamWriter;
-import java.io.ByteArrayOutputStream;
-import java.util.Vector;
+
+import org.apache.xml.serializer.OutputPropertiesFactory;
+import org.cyberneko.html.parsers.DOMParser;
+import org.jahia.utils.JahiaTools;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
=
/**
*
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/htmlparser/TagRemover.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/htmlparser/TagRemover.java&re=
v=3D19224&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/TagRemover.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/TagRemover.java Mon Nov 19 16:37:39 2007
@@ -25,10 +25,6 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
=
-import org.jahia.registries.ServicesRegistry;
-import java.util.Collection;
-import java.util.Collections;
-
/**
*
* <p>Title: Html DOM Visitor, removing tags</p>
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/htmlparser/TidyHtmlParser.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/htmlparser/TidyHtmlParser.jav=
a&rev=3D19224&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/TidyHtmlParser.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/TidyHtmlParser.java Mon Nov 19 16:37:39 2007
@@ -190,7 +190,7 @@
String charSet =3D null; // by default open as ascii
CharsetDetection charsetDet =3D new CharsetDetection();
try {
- strByte =3D org.apache.commons.io.IOUtils.toByteArray(result);
+ strByte =3D result.getBytes();
strIn =3D new ByteArrayInputStream(strByte);
charsetDet.charsetDetection(strIn);
charSet =3D charsetDet.getCharset();
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/htmlparser/ToRemoveMarkupSetting.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/htmlparser/ToRemoveMarkupSett=
ing.java&rev=3D19224&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/ToRemoveMarkupSetting.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
parser/ToRemoveMarkupSetting.java Mon Nov 19 16:37:39 2007
@@ -16,11 +16,7 @@
* limitations under the License.
*/package org.jahia.services.htmlparser;
=
-import java.util.Set;
-import java.util.Vector;
-
import org.jahia.registries.ServicesRegistry;
-import org.jahia.services.htmlparser.*;
=
/**
*
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
