Skip to content

Commit

Permalink
- we still use Java 1.4 ...
Browse files Browse the repository at this point in the history 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3386 6c8d7289-2bf4-0310-a012-ef5d649a1542
  • Loading branch information
karlchenofhell committed Feb 21, 2007
1 parent 0c7b8cf commit e97b6f0
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 24 deletions.
1 change: 0 additions & 1 deletion source/de/anomic/data/wiki/tokens/AbstractToken.java
View file
Expand Up @@ -18,6 +18,5 @@ public String getMarkup() {

public String getText() { return this.text; }

@Override
public String toString() { return getMarkup(); }
}
1 change: 0 additions & 1 deletion source/de/anomic/data/wiki/tokens/DefinitionListToken.java
View file
Expand Up @@ -9,7 +9,6 @@ public DefinitionListToken() {
super(';', null, null);
}

@Override
protected StringBuffer parse(String[] t, int depth, StringBuffer sb) {
sb.append("<dl>\n");
while (super.aktline < t.length && getGrade(t[super.aktline]) >= depth) {
Expand Down
1 change: 0 additions & 1 deletion source/de/anomic/data/wiki/tokens/LinkToken.java
View file
Expand Up @@ -42,7 +42,6 @@ public LinkToken(String localhost, String wikiPath) {
this.wikiPath = wikiPath;
}

@Override
protected boolean parse() {
StringBuilder sb = new StringBuilder();
Matcher m;
Expand Down
13 changes: 6 additions & 7 deletions source/de/anomic/data/wiki/tokens/ListToken.java
View file
Expand Up @@ -22,12 +22,12 @@ public ListToken(char firstChar, String listBlockElement) {
this.listElement = "li";
this.recursion = true;
this.pattern = new Pattern[] { Pattern.compile("^[" + firstChar + "]([^\n]|\n[" + firstChar + "])*", Pattern.MULTILINE) };
ArrayList<String> r = new ArrayList<String>();
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) {
Expand All @@ -36,12 +36,12 @@ public ListToken(char firstChar, String listBlockElement, String listElement) {
this.listElement = listElement;
this.recursion = true;
this.pattern = new Pattern[] { Pattern.compile("^[" + firstChar + "]([^\n]|\n[" + firstChar + "])*", Pattern.MULTILINE) };
ArrayList<String> r = new ArrayList<String>();
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) {
Expand All @@ -50,15 +50,14 @@ public ListToken(char firstChar, String listBlockElement, String listElement, bo
this.listElement = listElement;
this.recursion = recursion;
this.pattern = new Pattern[] { Pattern.compile("^[" + firstChar + "]([^\n]|\n[" + firstChar + "])*", Pattern.MULTILINE) };
ArrayList<String> r = new ArrayList<String>();
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);
Expand Down
15 changes: 10 additions & 5 deletions source/de/anomic/data/wiki/tokens/SimpleToken.java
View file
Expand Up @@ -21,13 +21,13 @@ public SimpleToken(char firstChar, char lastChar, String[][] definitionList, boo
this.definitionList = definitionList;
int i;
if (isBlockElements) {
ArrayList<String> r = new ArrayList<String>();
ArrayList r = new ArrayList();
int j;
for (i=0; i<definitionList.length; i++)
if (definitionList[i] != null)
for (j=0; j<definitionList[i].length; j++)
r.add(definitionList[i][j]);
this.blockElements = r.toArray(new String[r.size()]);
this.blockElements = (String[])r.toArray(new String[r.size()]);
} else {
this.blockElements = null;
}
Expand All @@ -39,11 +39,16 @@ public SimpleToken(char firstChar, char lastChar, String[][] definitionList, boo
}
this.pattern = new Pattern[] { Pattern.compile(String.format(
"([\\%s]{%d,%d})(.*?)([\\%s]{%d,%d})",
firstChar, i, definitionList.length,
lastChar, i, definitionList.length)) };
new Object[] {
new Character(firstChar),
new Integer(i),
new Integer(definitionList.length),
new Character(lastChar),
new Integer(i),
new Integer(definitionList.length)
} ))};
}

@Override
public String getMarkup() {
if (this.content == null) {
if (this.text == null) {
Expand Down
9 changes: 4 additions & 5 deletions source/de/anomic/data/wiki/tokens/TableToken.java
View file
Expand Up @@ -14,7 +14,6 @@ public class TableToken extends AbstractToken {
};
private static final String[] blockElementNames = new String[] { "table", "tr", "td" };

@Override
protected boolean parse() {
String[] t = text.split("\n");
String[] tds;
Expand Down Expand Up @@ -46,7 +45,7 @@ protected boolean parse() {

// from de.anomic.data.wikiCode.java.parseTableProperties, modified by [FB]
private static final String[] tps = { "rowspan", "colspan", "vspace", "hspace", "cellspacing", "cellpadding", "border" };
private static final HashMap<String,String[]> ps = new HashMap<String,String[]>();
private static final HashMap/* <String,String[]> */ 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" });
Expand All @@ -65,7 +64,7 @@ protected boolean parse() {
private static StringBuffer parseTableProperties(final String properties){
String[] values = properties.replaceAll("&quot;", "").split("[= ]"); //splitting the string at = and blanks
StringBuffer sb = new StringBuffer(properties.length());
Iterator<String> it;
Iterator it;
String key, valkey, value;
int numberofvalues = values.length;
main: for (int i=0; i<numberofvalues; i++) {
Expand All @@ -83,8 +82,8 @@ private static StringBuffer parseTableProperties(final String properties){
}
it = ps.keySet().iterator();
while (it.hasNext()) {
key = it.next();
if (valkey.equals(key) && isInArray(ps.get(key), value)) {
key = (String)it.next();
if (valkey.equals(key) && isInArray((String[])ps.get(key), (String)value)) {
addPair(valkey, value, sb);
continue main;
}
Expand Down
8 changes: 4 additions & 4 deletions source/de/anomic/data/wiki/wikiParser.java
View file
Expand Up @@ -27,7 +27,7 @@ public class wikiParser {

private static final String[] BEs;
static {
ArrayList<String> r = new ArrayList<String>();
ArrayList r = new ArrayList();
for (int i=0, k, j; i<tokens.length; i++)
if (tokens[i].getBlockElementNames() != null)
for (j=0; j<tokens[i].getBlockElementNames().length; j++) {
Expand All @@ -39,7 +39,7 @@ public class wikiParser {
}
}
r.add("hr");
BEs = r.toArray(new String[r.size()]);
BEs = (String[])r.toArray(new String[r.size()]);
}

public static void main(String[] args) {
Expand Down Expand Up @@ -175,7 +175,7 @@ private static Text[] split2Texts(String text, String escapeBegin, String escape
if (text.length() < 2) return new Text[] { new Text(text, false, true) };

int startLen = escapeBegin.length();
ArrayList<Text> r = new ArrayList<Text>();
ArrayList r = new ArrayList();
boolean escaped = text.startsWith(escapeBegin);
if (escaped) r.add(new Text("", false, true));
int i, j = 0;
Expand All @@ -185,7 +185,7 @@ private static Text[] split2Texts(String text, String escapeBegin, String escape
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) {
Expand Down

0 comments on commit e97b6f0

Please sign in to comment.