From e97b6f045833e230d6b2e0d04f9a023a6f9e9742 Mon Sep 17 00:00:00 2001 From: karlchenofhell Date: Wed, 21 Feb 2007 22:43:31 +0000 Subject: [PATCH] - we still use Java 1.4 ... git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3386 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- .../de/anomic/data/wiki/tokens/AbstractToken.java | 1 - .../data/wiki/tokens/DefinitionListToken.java | 1 - source/de/anomic/data/wiki/tokens/LinkToken.java | 1 - source/de/anomic/data/wiki/tokens/ListToken.java | 13 ++++++------- .../de/anomic/data/wiki/tokens/SimpleToken.java | 15 ++++++++++----- source/de/anomic/data/wiki/tokens/TableToken.java | 9 ++++----- source/de/anomic/data/wiki/wikiParser.java | 8 ++++---- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/source/de/anomic/data/wiki/tokens/AbstractToken.java b/source/de/anomic/data/wiki/tokens/AbstractToken.java index af001af8b..cd90b40ba 100644 --- a/source/de/anomic/data/wiki/tokens/AbstractToken.java +++ b/source/de/anomic/data/wiki/tokens/AbstractToken.java @@ -18,6 +18,5 @@ public abstract class AbstractToken implements Token { public String getText() { return this.text; } - @Override public String toString() { return getMarkup(); } } diff --git a/source/de/anomic/data/wiki/tokens/DefinitionListToken.java b/source/de/anomic/data/wiki/tokens/DefinitionListToken.java index fa77485bb..1c32f76e9 100644 --- a/source/de/anomic/data/wiki/tokens/DefinitionListToken.java +++ b/source/de/anomic/data/wiki/tokens/DefinitionListToken.java @@ -9,7 +9,6 @@ public class DefinitionListToken extends ListToken { super(';', null, null); } - @Override protected StringBuffer parse(String[] t, int depth, StringBuffer sb) { sb.append("
\n"); while (super.aktline < t.length && getGrade(t[super.aktline]) >= depth) { diff --git a/source/de/anomic/data/wiki/tokens/LinkToken.java b/source/de/anomic/data/wiki/tokens/LinkToken.java index a8dc86474..92eb27053 100644 --- a/source/de/anomic/data/wiki/tokens/LinkToken.java +++ b/source/de/anomic/data/wiki/tokens/LinkToken.java @@ -42,7 +42,6 @@ public class LinkToken extends AbstractToken { this.wikiPath = wikiPath; } - @Override protected boolean parse() { StringBuilder sb = new StringBuilder(); Matcher m; diff --git a/source/de/anomic/data/wiki/tokens/ListToken.java b/source/de/anomic/data/wiki/tokens/ListToken.java index 4cf58d84e..da30501df 100644 --- a/source/de/anomic/data/wiki/tokens/ListToken.java +++ b/source/de/anomic/data/wiki/tokens/ListToken.java @@ -22,12 +22,12 @@ public class ListToken extends AbstractToken { this.listElement = "li"; this.recursion = true; this.pattern = new Pattern[] { Pattern.compile("^[" + firstChar + "]([^\n]|\n[" + firstChar + "])*", Pattern.MULTILINE) }; - ArrayList r = new ArrayList(); + ArrayList r = new ArrayList(); if (this.listBlockElement != null) { if (this.recursion) r.add(this.listBlockElement); if (this.listElement != null) r.add(this.listElement); } - blockElements = r.toArray(new String[r.size()]); + blockElements = (String[])r.toArray(new String[r.size()]); } public ListToken(char firstChar, String listBlockElement, String listElement) { @@ -36,12 +36,12 @@ public class ListToken extends AbstractToken { this.listElement = listElement; this.recursion = true; this.pattern = new Pattern[] { Pattern.compile("^[" + firstChar + "]([^\n]|\n[" + firstChar + "])*", Pattern.MULTILINE) }; - ArrayList r = new ArrayList(); + ArrayList r = new ArrayList(); if (this.listBlockElement != null) { if (this.recursion) r.add(this.listBlockElement); if (this.listElement != null) r.add(this.listElement); } - blockElements = r.toArray(new String[r.size()]); + blockElements = (String[])r.toArray(new String[r.size()]); } public ListToken(char firstChar, String listBlockElement, String listElement, boolean recursion) { @@ -50,15 +50,14 @@ public class ListToken extends AbstractToken { this.listElement = listElement; this.recursion = recursion; this.pattern = new Pattern[] { Pattern.compile("^[" + firstChar + "]([^\n]|\n[" + firstChar + "])*", Pattern.MULTILINE) }; - ArrayList r = new ArrayList(); + ArrayList r = new ArrayList(); if (this.listBlockElement != null) { if (this.recursion) r.add(this.listBlockElement); if (this.listElement != null) r.add(this.listElement); } - blockElements = r.toArray(new String[r.size()]); + blockElements = (String[])r.toArray(new String[r.size()]); } - @Override protected boolean parse() { StringBuffer sb = new StringBuffer(this.text.length()); parse(this.text.split("\n"), 0, sb); diff --git a/source/de/anomic/data/wiki/tokens/SimpleToken.java b/source/de/anomic/data/wiki/tokens/SimpleToken.java index 9d7c0229c..00a6a1781 100644 --- a/source/de/anomic/data/wiki/tokens/SimpleToken.java +++ b/source/de/anomic/data/wiki/tokens/SimpleToken.java @@ -21,13 +21,13 @@ public class SimpleToken extends AbstractToken { this.definitionList = definitionList; int i; if (isBlockElements) { - ArrayList r = new ArrayList(); + ArrayList r = new ArrayList(); int j; for (i=0; i ps = new HashMap(); + private static final HashMap/* */ ps = new HashMap(); static { ps.put("frame", new String[] { "void", "above", "below", "hsides", "lhs", "rhs", "vsides", "box", "border" }); ps.put("rules", new String[] { "none", "groups", "rows", "cols", "all" }); @@ -65,7 +64,7 @@ public class TableToken extends AbstractToken { private static StringBuffer parseTableProperties(final String properties){ String[] values = properties.replaceAll(""", "").split("[= ]"); //splitting the string at = and blanks StringBuffer sb = new StringBuffer(properties.length()); - Iterator it; + Iterator it; String key, valkey, value; int numberofvalues = values.length; main: for (int i=0; i r = new ArrayList(); + ArrayList r = new ArrayList(); for (int i=0, k, j; i r = new ArrayList(); + ArrayList r = new ArrayList(); boolean escaped = text.startsWith(escapeBegin); if (escaped) r.add(new Text("", false, true)); int i, j = 0; @@ -185,7 +185,7 @@ public class wikiParser { escaped = !escaped; } r.add(resolve2Text(text, escaped, (escaped) ? j : (j > 0) ? j + startLen : 0, -1, escapeEnd)); - return r.toArray(new Text[r.size()]); + return (Text[])r.toArray(new Text[r.size()]); } private static Text resolve2Text(String text, boolean escaped, int from, int to, String escapeEnd) {