yet some more 1.1 collection fixes
This commit is contained in:
parent
d0eaced696
commit
a845778d44
2 changed files with 9 additions and 6 deletions
|
@ -10,7 +10,10 @@ import FESI.Exceptions.*;
|
||||||
import FESI.Extensions.*;
|
import FESI.Extensions.*;
|
||||||
import FESI.Data.*;
|
import FESI.Data.*;
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.util.*;
|
import java.util.Hashtable;
|
||||||
|
import java.util.Enumeration;
|
||||||
|
import java.util.TimeZone;
|
||||||
|
import java.util.Date;
|
||||||
import java.text.*;
|
import java.text.*;
|
||||||
import org.xml.sax.InputSource;
|
import org.xml.sax.InputSource;
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
package helma.framework.core;
|
package helma.framework.core;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.util.Vector;
|
import java.util.ArrayList;
|
||||||
import java.util.Hashtable;
|
import java.util.Hashtable;
|
||||||
import helma.framework.*;
|
import helma.framework.*;
|
||||||
import FESI.Data.*;
|
import FESI.Data.*;
|
||||||
|
@ -30,7 +30,7 @@ public class Skin {
|
||||||
|
|
||||||
public void parse (String content) {
|
public void parse (String content) {
|
||||||
|
|
||||||
Vector partBuffer = new Vector ();
|
ArrayList partBuffer = new ArrayList ();
|
||||||
int l = content.length ();
|
int l = content.length ();
|
||||||
char cnt[] = new char[l];
|
char cnt[] = new char[l];
|
||||||
content.getChars (0, l, cnt, 0);
|
content.getChars (0, l, cnt, 0);
|
||||||
|
@ -44,16 +44,16 @@ public class Skin {
|
||||||
}
|
}
|
||||||
if (j > i+2) {
|
if (j > i+2) {
|
||||||
if (i - lastIdx > 0)
|
if (i - lastIdx > 0)
|
||||||
partBuffer.addElement (new String (cnt, lastIdx, i - lastIdx));
|
partBuffer.add (new String (cnt, lastIdx, i - lastIdx));
|
||||||
String macrotext = new String (cnt, i+2, (j-i)-2);
|
String macrotext = new String (cnt, i+2, (j-i)-2);
|
||||||
partBuffer.addElement (new Macro (macrotext));
|
partBuffer.add (new Macro (macrotext));
|
||||||
lastIdx = j+2;
|
lastIdx = j+2;
|
||||||
}
|
}
|
||||||
i = j+1;
|
i = j+1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (lastIdx < l)
|
if (lastIdx < l)
|
||||||
partBuffer.addElement (new String (cnt, lastIdx, l - lastIdx));
|
partBuffer.add (new String (cnt, lastIdx, l - lastIdx));
|
||||||
|
|
||||||
parts = partBuffer.toArray ();
|
parts = partBuffer.toArray ();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue