Revision: 3959
http://vexi.svn.sourceforge.net/vexi/?rev=3959&view=rev
Author: clrg
Date: 2010-11-03 22:29:34 +0000 (Wed, 03 Nov 2010)
Log Message:
-----------
Minor clean up
Modified Paths:
--------------
trunk/org.vexi-core.main/src/main/jpp/org/vexi/core/Box.jpp
Modified: trunk/org.vexi-core.main/src/main/jpp/org/vexi/core/Box.jpp
===================================================================
--- trunk/org.vexi-core.main/src/main/jpp/org/vexi/core/Box.jpp 2010-11-02
01:27:47 UTC (rev 3958)
+++ trunk/org.vexi-core.main/src/main/jpp/org/vexi/core/Box.jpp 2010-11-03
22:29:34 UTC (rev 3959)
@@ -200,7 +200,7 @@
private static final int localToGlobalY(Box b, int y) { return
b.parent==null ? y : localToGlobalY(b.parent, y + getYInParent(b)); }
// useful debugging reflow problems
- private static final int depth(Box b) { return b.parent==null ? 0 :
depth(b.parent)+1; }
+ //private static final int depth(Box b) { return b.parent==null ? 0 :
depth(b.parent)+1; }
private static final int min(int a, int b) { return (a<b) ? a : b; }
private static final int max(int a, int b) { return (a>b) ? a : b; }
@@ -262,10 +262,10 @@
private static final int ALIGN_LEFT = 0x00040000;
private static final int ALIGN_RIGHT = 0x00080000;
private static final int ALIGNS = ALIGN_TOP | ALIGN_BOTTOM | ALIGN_LEFT |
ALIGN_RIGHT;
- private static final int ALIGN_TOPLEFT = ALIGN_TOP|ALIGN_LEFT;
- private static final int ALIGN_TOPRIGHT = ALIGN_TOP|ALIGN_RIGHT;
- private static final int ALIGN_BOTTOMLEFT = ALIGN_BOTTOM|ALIGN_LEFT;
- private static final int ALIGN_BOTTOMRIGHT = ALIGN_BOTTOM|ALIGN_RIGHT;
+ private static final int ALIGN_TOPLEFT = ALIGN_TOP | ALIGN_LEFT;
+ private static final int ALIGN_TOPRIGHT = ALIGN_TOP | ALIGN_RIGHT;
+ private static final int ALIGN_BOTTOMLEFT = ALIGN_BOTTOM | ALIGN_LEFT;
+ private static final int ALIGN_BOTTOMRIGHT = ALIGN_BOTTOM | ALIGN_RIGHT;
private static final int ENTER_TRAP = 0x00100000;
private static final int LEAVE_TRAP = 0x00200000;
@@ -369,10 +369,10 @@
if (cur.texture != null && !cur.test(TILE_IMAGE)) {
// REMARK: inefficient but otherwise the consistency of
// translating enlarged pixels to on-screen coordinates
- // can not be guarranteed as it depends upon first
+ // can not be guaranteed as it depends upon first
// rendering the image at the full size of its box
// FIXME: this is the wrong place to do this - should
- // prerender enlarged image at time of render and then
+ // pre-render enlarged image at time of render and then
// just paint the relevant part of the enlarged image
x = 0;
y = 0;
@@ -1170,12 +1170,9 @@
//#repeat Width/Height width/height WIDTH/HEIGHT
/** set minwidth/maxwidth according to min/max */
- private final void setMinMaxWidth(int min, int max) throws JSExn {
- if (this.minwidth == min && this.maxwidth == max) {
- return;
- }
- setMinWidth(min, true);
- setMaxWidth(max, true);
+ private final void setMinMaxWidth(int minwidth, int maxwidth) throws JSExn
{
+ setMinWidth(minwidth, true);
+ setMaxWidth(maxwidth, true);
}
//#end
@@ -1217,7 +1214,7 @@
//#repeat Width/Height width/height WIDTH/HEIGHT
/** set maxwidth and fire traps if necessary - returns false iff
setMinwidth is called */
- private final void setMaxWidth(int maxwidth, boolean firetraps) throws
JSExn {
+ private final void setMaxWidth(short maxwidth, boolean firetraps) throws
JSExn {
if (this.maxwidth == maxwidth) {
return;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book "Blueprint to a
Billion" shares his insights and actions to help propel your
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-dev2dev
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
