Revision: 2982
http://vexi.svn.sourceforge.net/vexi/?rev=2982&view=rev
Author: mkpg2
Date: 2008-07-21 14:59:03 +0000 (Mon, 21 Jul 2008)
Log Message:
-----------
Fix. Accidentally broke compatability with java 1.4
Modified Paths:
--------------
trunk/core/org.vexi.core/src/org/vexi/core/Resources.java
trunk/core/org.vexi.core/src/org/vexi/graphics/Font.java
trunk/core/org.vexi.core/src/org/vexi/plat/Java2.java
Modified: trunk/core/org.vexi.core/src/org/vexi/core/Resources.java
===================================================================
--- trunk/core/org.vexi.core/src/org/vexi/core/Resources.java 2008-07-21
14:43:25 UTC (rev 2981)
+++ trunk/core/org.vexi.core/src/org/vexi/core/Resources.java 2008-07-21
14:59:03 UTC (rev 2982)
@@ -134,7 +134,7 @@
r = _fountainForURL(arg);
if(r instanceof Fountain.HTTP) r = Resources.cache(r);
else if(r==null){
- if(arg.contains("!")){
+ if(arg.indexOf("!")!=-1){
// FEATURE - make recursive (any depth of wrapping)
String archivePath = arg.substring(0,arg.indexOf("!"));
Fountain archive = Fountain.newZip(new
Fountain.File(archivePath));
Modified: trunk/core/org.vexi.core/src/org/vexi/graphics/Font.java
===================================================================
--- trunk/core/org.vexi.core/src/org/vexi/graphics/Font.java 2008-07-21
14:43:25 UTC (rev 2981)
+++ trunk/core/org.vexi.core/src/org/vexi/graphics/Font.java 2008-07-21
14:59:03 UTC (rev 2982)
@@ -7,14 +7,12 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.LinkedList;
-import java.util.Queue;
import java.util.WeakHashMap;
import org.ibex.js.JS;
import org.ibex.js.JSU;
import org.ibex.js.Scheduler;
import org.ibex.nestedvm.Runtime;
-import org.ibex.util.Basket;
import org.ibex.util.Callable;
import org.ibex.util.IOUtil;
import org.ibex.util.Log;
@@ -57,7 +55,7 @@
// Statics
//////////////////////////////////////////////////////////////////////
// REMARK - Basket.Array is an inefficient queue(see dequeue). Using
java.util
- static final Queue glyphsToBeCached = new LinkedList();
+ static final LinkedList glyphsToBeCached = new LinkedList();
// FIXME - have this as a priority task
//static final Queue glyphsToBeDisplayed = new LinkedList();
private static WeakHashMap fonts = new WeakHashMap();
@@ -110,7 +108,7 @@
// FIXME: this should be a low-priority task
glyphRenderingTaskIsScheduled = false;
if (glyphsToBeCached.size()==0) return null;
- Glyph g = (Glyph)glyphsToBeCached.remove();
+ Glyph g = (Glyph)glyphsToBeCached.removeFirst();
if (g != null){
Log.debug(Font.class, "glyphRenderingTask rendering " + g.c + "
of " + g.font);
g.render();
Modified: trunk/core/org.vexi.core/src/org/vexi/plat/Java2.java
===================================================================
--- trunk/core/org.vexi.core/src/org/vexi/plat/Java2.java 2008-07-21
14:43:25 UTC (rev 2981)
+++ trunk/core/org.vexi.core/src/org/vexi/plat/Java2.java 2008-07-21
14:59:03 UTC (rev 2982)
@@ -50,7 +50,7 @@
{
String osname = System.getProperty("os.name");
System.out.println(osname);
- if(osname.contains("Windows")){
+ if(osname.indexOf("Windows")!=-1){
dir = new File("c:/Windows/Fonts");
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
