# HG changeset patch # User Jaroslav Tulach # Date 1362505649 -3600 # Node ID 2108bb8770a56a76e8c141500612a50b8ac592aa # Parent 9eb750594b1562facb6ca73c281b6d8af71aeb7f# Parent d127d41768bdab9af6ebfc9412e97887141281b8 Merging Toni's fix for the canvas getHeight/Width methods diff -r 9eb750594b15 -r 2108bb8770a5 javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/Canvas.java --- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/Canvas.java Mon Mar 04 19:20:40 2013 +0100 +++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/Canvas.java Tue Mar 05 18:47:29 2013 +0100 @@ -18,6 +18,7 @@ package org.apidesign.bck2brwsr.htmlpage.api; import org.apidesign.bck2brwsr.core.JavaScriptBody; +import static org.apidesign.bck2brwsr.htmlpage.api.Element.getAttribute; /** * @@ -34,7 +35,8 @@ } public int getHeight() { - return (Integer) getAttribute(this, "height"); + Object ret = getAttribute(this, "height"); + return (ret instanceof Number) ? ((Number)ret).intValue(): Integer.MIN_VALUE; } public void setWidth(int width) { @@ -42,7 +44,8 @@ } public int getWidth() { - return (Integer) getAttribute(this, "width"); + Object ret = getAttribute(this, "width"); + return (ret instanceof Number) ? ((Number)ret).intValue(): Integer.MIN_VALUE; } @JavaScriptBody(