projects
/
org.ibex.core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mass rename and rebranding from xwt to ibex - fixed to use ixt files
[org.ibex.core.git]
/
src
/
org
/
ibex
/
Box.java
diff --git
a/src/org/xwt/Box.java
b/src/org/ibex/Box.java
similarity index 99%
rename from
src/org/xwt/Box.java
rename to
src/org/ibex/Box.java
index
7743120
..
1301639
100644
(file)
--- a/
src/org/xwt/Box.java
+++ b/
src/org/ibex/Box.java
@@
-1,6
+1,6
@@
// FIXME
// Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL]
// FIXME
// Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL]
-package org.xwt;
+package org.ibex;
// FEATURE: reflow before allowing js to read from width/height
// FEATURE: fastpath for rows=1/cols=1
// FEATURE: reflow before allowing js to read from width/height
// FEATURE: fastpath for rows=1/cols=1
@@
-11,16
+11,14
@@
package org.xwt;
// FEATURE: or else have a way to mark a column "same as last one"?
// FEATURE: reintroduce surface.abort
// FEATURE: or else have a way to mark a column "same as last one"?
// FEATURE: reintroduce surface.abort
-import java.io.*;
-import java.net.*;
import java.util.*;
import java.util.*;
-import org.xwt.js.*;
-import org.xwt.util.*;
+import org.ibex.js.*;
+import org.ibex.util.*;
import org.xwt.translators.*;
/**
* <p>
import org.xwt.translators.*;
/**
* <p>
- * Encapsulates the data for a single XWT box as well as all layout
+ * Encapsulates the data for a single Ibex box as well as all layout
* rendering logic.
* </p>
*
* rendering logic.
* </p>
*
@@
-390,7
+388,7
@@
public final class Box extends JSScope implements Scheduler.Task {
}
}
- // Methods to implement org.xwt.js.JS //////////////////////////////////////
+ // Methods to implement org.ibex.js.JS //////////////////////////////////////
public int globalToLocalX(int x) { return parent == null ? x : parent.globalToLocalX(x - this.x); }
public int globalToLocalY(int y) { return parent == null ? y : parent.globalToLocalY(y - this.y); }
public int globalToLocalX(int x) { return parent == null ? x : parent.globalToLocalX(x - this.x); }
public int globalToLocalY(int y) { return parent == null ? y : parent.globalToLocalY(y - this.y); }
@@
-729,7
+727,7
@@
public final class Box extends JSScope implements Scheduler.Task {
int globaly = 0;
// WARNING: this method is called from the event-queueing thread -- it may run concurrently with
int globaly = 0;
// WARNING: this method is called from the event-queueing thread -- it may run concurrently with
- // ANY part of XWT, and is UNSYNCHRONIZED for performance reasons. BE CAREFUL HERE.
+ // ANY part of Ibex, and is UNSYNCHRONIZED for performance reasons. BE CAREFUL HERE.
if (!cur.test(VISIBLE)) return null;
if (!cur.inside(x - globalx, y - globaly)) return cur.parent == null ? cur : null;
if (!cur.test(VISIBLE)) return null;
if (!cur.inside(x - globalx, y - globaly)) return cur.parent == null ? cur : null;