Revision: 2293
http://vexi.svn.sourceforge.net/vexi/?rev=2293&view=rev
Author: clrg
Date: 2007-09-20 15:32:21 -0700 (Thu, 20 Sep 2007)
Log Message:
-----------
Oh dear... ArrayIndexOutOfBoundsException in possibly the simplest file of all
time... the shame!
Modified Paths:
--------------
trunk/core/org.vexi.core/src/org/vexi/util/BasicTree.java
Modified: trunk/core/org.vexi.core/src/org/vexi/util/BasicTree.java
===================================================================
--- trunk/core/org.vexi.core/src/org/vexi/util/BasicTree.java 2007-09-20
21:17:07 UTC (rev 2292)
+++ trunk/core/org.vexi.core/src/org/vexi/util/BasicTree.java 2007-09-20
22:32:21 UTC (rev 2293)
@@ -23,10 +23,10 @@
final public void insertNode(Object obj) { insertNode(size, obj); }
final public void insertNode(int i, Object obj) {
- treeSize(size + 1);
+ treeSize(size+1);
if (size > i)
{
- System.arraycopy(o, i, o, i + 1, size - i);
+ System.arraycopy(o, i, o, i+1, size-i);
o[i] = obj;
}
else o[size] = obj;
@@ -36,7 +36,7 @@
final public Object replaceNode(int i, Object obj) {
if (i > size)
{
- treeSize(size + 1);
+ treeSize(size+1);
i = size;
}
Object old = o[i];
@@ -53,9 +53,9 @@
if (i >= size || i < 0) return null;
Object old = o[i];
if (size == 1) o = null;
- else if (size > i + 1)
- System.arraycopy(o, i + 1, o, i, size - i - 1);
- else o[size] = null;
+ else if (size-1 > i)
+ System.arraycopy(o, i+1, o, i, size-i-1);
+ else o[size-1] = null;
size--;
return old;
}
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: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
