Revision: 4597
http://sourceforge.net/p/vexi/code/4597
Author: clrg
Date: 2013-11-21 19:44:02 +0000 (Thu, 21 Nov 2013)
Log Message:
-----------
Compile fix
Modified Paths:
--------------
branches/vexi3/org.vexi-core.main/src/main/jpp/org/vexi/core/Vexi.jpp
Modified: branches/vexi3/org.vexi-core.main/src/main/jpp/org/vexi/core/Vexi.jpp
===================================================================
--- branches/vexi3/org.vexi-core.main/src/main/jpp/org/vexi/core/Vexi.jpp
2013-11-21 19:19:25 UTC (rev 4596)
+++ branches/vexi3/org.vexi-core.main/src/main/jpp/org/vexi/core/Vexi.jpp
2013-11-21 19:44:02 UTC (rev 4597)
@@ -468,7 +468,7 @@
/* The current default textcolor
* @initial_value(#000000)
* @type(String) */
- case "ui.textcolor": return
JSU.S(Color.colorToString(BoxRenderProperties.DEFAULT_COLOR));
+ case "ui.textcolor": return
JSU.S(Color.colorToString(BoxVisual.DEFAULT_COLOR));
/* <p>The current default fontsize, in points.</p>
*
@@ -479,48 +479,48 @@
*
* @initial_value(10)
* @type(Number) */
- case "ui.fontsize.medium": return
JSU.N(BoxRenderProperties.MEDIUM_SIZE);
+ case "ui.fontsize.medium": return JSU.N(BoxVisual.MEDIUM_SIZE);
/* Extra extra small offset from the current default fontsize, used
when a box's fontsize
* is set to <code>"xxsmall"</code>
* @initial_value(-8)
* @type(Number) */
- case "ui.fontsize.xxsmall": return
JSU.N(BoxRenderProperties.MEDIUM_SIZE+BoxRenderProperties.XXSMALL_OFFSET);
+ case "ui.fontsize.xxsmall": return
JSU.N(BoxVisual.MEDIUM_SIZE+BoxVisual.XXSMALL_OFFSET);
/* Extra small offset from the current default fontsize, used when a
box's fontsize
* is set to <code>"xsmall"</code>
* @initial_value(-4)
* @type(Number) */
- case "ui.fontsize.xsmall": return
JSU.N(BoxRenderProperties.MEDIUM_SIZE+BoxRenderProperties.XSMALL_OFFSET);
+ case "ui.fontsize.xsmall": return
JSU.N(BoxVisual.MEDIUM_SIZE+BoxVisual.XSMALL_OFFSET);
/* Small offset from the current default fontsize, used when a box's
fontsize
* is set to <code>"small"</code>
* @initial_value(-2)
* @type(Number) */
- case "ui.fontsize.small": return
JSU.N(BoxRenderProperties.MEDIUM_SIZE+BoxRenderProperties.SMALL_OFFSET);
+ case "ui.fontsize.small": return
JSU.N(BoxVisual.MEDIUM_SIZE+BoxVisual.SMALL_OFFSET);
/* Large offset from the current default fontsize, used when a box's
fontsize
* is set to <code>"large"</code>
* @initial_value(4)
* @type(Number) */
- case "ui.fontsize.large": return
JSU.N(BoxRenderProperties.MEDIUM_SIZE+BoxRenderProperties.LARGE_OFFSET);
+ case "ui.fontsize.large": return
JSU.N(BoxVisual.MEDIUM_SIZE+BoxVisual.LARGE_OFFSET);
/* Extra large offset from the current default fontsize, used when a
box's fontsize
* is set to <code>"xlarge"</code>
* @initial_value(8)
* @type(Number) */
- case "ui.fontsize.xlarge": return
JSU.N(BoxRenderProperties.MEDIUM_SIZE+BoxRenderProperties.XLARGE_OFFSET);
+ case "ui.fontsize.xlarge": return
JSU.N(BoxVisual.MEDIUM_SIZE+BoxVisual.XLARGE_OFFSET);
/* Extra extra large offset from the current default fontsize, used
when a box's fontsize
* is set to <code>"xxlarge"</code>
* @initial_value(14)
* @type(Number) */
- case "ui.fontsize.xxlarge": return
JSU.N(BoxRenderProperties.MEDIUM_SIZE+BoxRenderProperties.XXLARGE_OFFSET);
+ case "ui.fontsize.xxlarge": return
JSU.N(BoxVisual.MEDIUM_SIZE+BoxVisual.XXLARGE_OFFSET);
/* The current default font stream
* @initial_value(vexi.ui.font.sansserif)
* @type(Stream) */
- case "ui.font.defaultstream": return
BoxRenderProperties.DEFAULT_STREAM;
+ case "ui.font.defaultstream": return BoxVisual.DEFAULT_STREAM;
case "ui.font.install": return METHOD;
/* @nofollow */
case "ui.font.installed": return Resources.installedFonts;
@@ -658,7 +658,7 @@
case "ui.textcolor":
throw new JSExn("not yet implemented");
/*
- BoxRenderProperties.DEFAULT_COLOR =
Color.stringToColor(JSU.toString(value));
+ BoxVisual.DEFAULT_COLOR = Color.stringToColor(JSU.toString(value));
// dirty all surfaces
for (int i=0; i<Surface.allSurfaces.size(); i++) {
((Surface)Surface.allSurfaces.elementAt(i)).dirty();
@@ -670,7 +670,7 @@
if (6>ps && ps!=0) {
throw new JSExn("Minimum font pointsize is 6");
}
- if (BoxRenderProperties.setDefaultPointsize(ps)) {
+ if (BoxVisual.setDefaultPointsize(ps)) {
// reflow all surfaces
// FIXME: this does not get work for Boxes with text where
// the Box's box tree is not currently assigned a Surface
@@ -684,7 +684,7 @@
case "ui.font.defaultstream":
throw new JSExn("not yet implemented");
/*
- BoxRenderProperties.DEFAULT_STREAM = (Fountain)value.unclone();
+ BoxVisual.DEFAULT_STREAM = (Fountain)value.unclone();
// reflow all surfaces
for (int i=0; i<Surface.allSurfaces.size(); i++) {
Box.reflowTree(((Surface)Surface.allSurfaces.elementAt(i)).root);
@@ -799,14 +799,14 @@
//#switch(JSU.toString(method))
case "ui.font.height":
try {
- return JSU.N(Font.getFont(args[0],
BoxRenderProperties.jsToPointsize(args[1])).textheight(JSU.toString(args[2])));
+ return JSU.N(Font.getFont(args[0],
BoxVisual.jsToPointsize(args[1])).textheight(JSU.toString(args[2])));
} catch (Exception e) {
throw new JSExn("called vexi.ui.font.height with
illegal arguments");
}
case "ui.font.wait": throw new Error("FIXME: vexi.ui.font.wait
not implemented");
case "ui.font.width":
try {
- return JSU.N(Font.getFont(args[0],
BoxRenderProperties.jsToPointsize(args[1])).textwidth(JSU.toString(args[2])));
+ return JSU.N(Font.getFont(args[0],
BoxVisual.jsToPointsize(args[1])).textwidth(JSU.toString(args[2])));
} catch (Exception e) {
throw new JSExn("called vexi.ui.font.width with
illegal arguments");
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Shape the Mobile Experience: Free Subscription
Software experts and developers: Be at the forefront of tech innovation.
Intel(R) Software Adrenaline delivers strategic insight and game-changing
conversations that shape the rapidly evolving mobile landscape. Sign up now.
http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
