diff --git a/appinventor/appengine/build.xml b/appinventor/appengine/build.xml index 3e7dbf2d53f..a94049ccaa9 100644 --- a/appinventor/appengine/build.xml +++ b/appinventor/appengine/build.xml @@ -591,7 +591,6 @@ - diff --git a/appinventor/appengine/src/com/google/appinventor/YaClient.gwt.xml b/appinventor/appengine/src/com/google/appinventor/YaClient.gwt.xml index 5434d67b47a..199c6738228 100644 --- a/appinventor/appengine/src/com/google/appinventor/YaClient.gwt.xml +++ b/appinventor/appengine/src/com/google/appinventor/YaClient.gwt.xml @@ -19,11 +19,8 @@ - - - diff --git a/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockBall.java b/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockBall.java index c211c423447..26625f8ca14 100644 --- a/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockBall.java +++ b/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockBall.java @@ -7,9 +7,13 @@ package com.google.appinventor.client.editor.simple.components; import com.google.appinventor.client.editor.simple.SimpleEditor; +import com.google.appinventor.client.utils.Color; +import com.google.gwt.canvas.dom.client.Context2d; +import com.google.gwt.dom.client.CanvasElement; +import com.google.gwt.dom.client.Document; +import com.google.gwt.dom.client.Style; import com.google.gwt.user.client.ui.SimplePanel; -import com.google.gwt.widgetideas.graphics.client.Color; -import com.google.gwt.widgetideas.graphics.client.GWTCanvas; +import com.google.gwt.user.client.ui.Widget; /** * Mock Ball component. @@ -31,7 +35,7 @@ public final class MockBall extends MockVisibleComponent implements MockSprite { // Widget for showing the mock ball private final SimplePanel ballWidget; - private final GWTCanvas canvas; + private final CanvasElement canvas; private int radius = DEFAULT_RADIUS; private int diameter = 2 * radius; @@ -54,23 +58,43 @@ public MockBall(SimpleEditor editor) { ballWidget.setStylePrimaryName("ode-SimpleMockComponent"); // Create an appropriately sized ball - canvas = new GWTCanvas(diameter, diameter); - canvas.setPixelSize(diameter, diameter); - canvas.setBackgroundColor(GWTCanvas.TRANSPARENT); - fillCircle(); - ballWidget.setWidget(canvas); + canvas = Document.get().createCanvasElement(); + canvas.setWidth(diameter); + canvas.setHeight(diameter); + canvas.getStyle().setWidth(diameter, Style.Unit.PX); + canvas.getStyle().setHeight(diameter, Style.Unit.PX); + fillCircle(canvas); + ballWidget.getElement().appendChild(canvas); initComponent(ballWidget); } + /** + * Draws the ball onto the drag widget. This is necessary because cloning a CanvasElement + * does not copy the drawn contents. Otherwise, the drag widget would be a canvas. + * + * @param dragWidget cloned widget used for dragging + */ + @Override + protected void onDragWidgetCreated(Widget dragWidget) { + super.onDragWidgetCreated(dragWidget); + CanvasElement el = (CanvasElement) dragWidget.getElement().getFirstChildElement(); + el.setWidth(diameter); + el.setHeight(diameter); + el.getStyle().setWidth(diameter, Style.Unit.PX); + el.getStyle().setHeight(diameter, Style.Unit.PX); + fillCircle(el); + } + // Drawing - private void fillCircle() { - canvas.clear(); - canvas.setFillStyle(color); - canvas.beginPath(); - canvas.arc(radius, radius, radius, 0, Math.PI * 2, true); - canvas.fill(); + private void fillCircle(CanvasElement el) { + final Context2d context = el.getContext2d(); + context.clearRect(0, 0, diameter, diameter); + context.setFillStyle(color.toString()); + context.beginPath(); + context.arc(radius, radius, radius, 0, Math.PI * 2, true); + context.fill(); } // Handling property changes @@ -79,9 +103,11 @@ private void setRadiusProperty(String text) { try { radius = Integer.parseInt(text); diameter = 2 * radius; - canvas.setCoordSize(diameter, diameter); - canvas.setPixelSize(diameter, diameter); - fillCircle(); + canvas.setWidth(diameter); + canvas.setHeight(diameter); + canvas.getStyle().setWidth(diameter, Style.Unit.PX); + canvas.getStyle().setHeight(diameter, Style.Unit.PX); + fillCircle(canvas); if (originAtCenter) { // Force the position of the ballWidget to be adjusted relative // to the parent canvas. @@ -97,7 +123,7 @@ private void setColorProperty(String text) { text = "&HFF000000"; // black } color = MockComponentsUtil.getColor(text); - fillCircle(); + fillCircle(canvas); } private void refreshCanvas() { diff --git a/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockComponent.java b/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockComponent.java index 52f61baefb2..3c405ae4551 100644 --- a/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockComponent.java +++ b/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockComponent.java @@ -1063,9 +1063,15 @@ public final Widget createDragWidget(int x, int y) { // the drag widget itself isn't hidden. setVisible(false); + onDragWidgetCreated(w); + return w; } + protected void onDragWidgetCreated(Widget dragWidget) { + // Do nothing by default. Subclasses may override. + } + @Override public Widget getDragWidget() { return dragSourceSupport.getDragWidget(); diff --git a/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockComponentsUtil.java b/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockComponentsUtil.java index 1aa4c39f359..ba30514c895 100644 --- a/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockComponentsUtil.java +++ b/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockComponentsUtil.java @@ -9,6 +9,7 @@ import com.google.appinventor.client.Ode; import com.google.appinventor.client.editor.simple.SimpleEditor; import com.google.appinventor.client.explorer.project.Project; +import com.google.appinventor.client.utils.Color; import com.google.appinventor.shared.rpc.project.HasAssetsFolder; import com.google.appinventor.shared.rpc.project.ProjectNode; import com.google.appinventor.shared.rpc.project.youngandroid.YoungAndroidAssetsFolder; @@ -24,7 +25,6 @@ import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.Widget; -import com.google.gwt.widgetideas.graphics.client.Color; /** * Helper methods for working with mock components. diff --git a/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockMapFeatureBase.java b/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockMapFeatureBase.java index ae9eca40b95..0103f05e4fa 100644 --- a/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockMapFeatureBase.java +++ b/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockMapFeatureBase.java @@ -7,13 +7,13 @@ import com.google.appinventor.client.editor.simple.components.i18n.ComponentTranslationTable; import com.google.appinventor.client.editor.simple.SimpleEditor; +import com.google.appinventor.client.utils.Color; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.json.client.JSONObject; import com.google.gwt.json.client.JSONValue; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.Event; import com.google.gwt.user.client.ui.SimplePanel; -import com.google.gwt.widgetideas.graphics.client.Color; import java.util.Collection; import java.util.HashSet; diff --git a/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockMapFeatureBaseWithFill.java b/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockMapFeatureBaseWithFill.java index 85e9df672f2..68998dd76c1 100644 --- a/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockMapFeatureBaseWithFill.java +++ b/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockMapFeatureBaseWithFill.java @@ -6,10 +6,10 @@ package com.google.appinventor.client.editor.simple.components; import com.google.appinventor.client.editor.simple.SimpleEditor; +import com.google.appinventor.client.utils.Color; import com.google.gwt.json.client.JSONObject; import com.google.gwt.json.client.JSONValue; import com.google.gwt.resources.client.ImageResource; -import com.google.gwt.widgetideas.graphics.client.Color; public abstract class MockMapFeatureBaseWithFill extends MockMapFeatureBase { public static final String PROPERTY_NAME_FILLCOLOR = "FillColor"; diff --git a/appinventor/appengine/src/com/google/appinventor/client/explorer/commands/MiniProgressBar.java b/appinventor/appengine/src/com/google/appinventor/client/explorer/commands/MiniProgressBar.java index c753c0e80fc..2d970a8654c 100755 --- a/appinventor/appengine/src/com/google/appinventor/client/explorer/commands/MiniProgressBar.java +++ b/appinventor/appengine/src/com/google/appinventor/client/explorer/commands/MiniProgressBar.java @@ -5,11 +5,10 @@ // http://www.apache.org/licenses/LICENSE-2.0 package com.google.appinventor.client.explorer.commands; +import com.google.gwt.dom.client.Style; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.ui.Widget; -import com.google.gwt.widgetideas.client.ResizableWidget; -import com.google.gwt.widgetideas.client.ResizableWidgetCollection; /** * A widget that displays progress on an arbitrary scale. @@ -26,7 +25,7 @@ * text when progress is greater than 50 percent } * */ -public class MiniProgressBar extends Widget implements ResizableWidget { +public class MiniProgressBar extends Widget { private static final String DEFAULT_TEXT_CLASS_NAME = "gwt-ProgressBar-text"; @@ -378,16 +377,10 @@ protected Element getTextElement() { @Override protected void onLoad() { // Reset the position attribute of the parent element - DOM.setStyleAttribute(getElement(), "position", "relative"); - ResizableWidgetCollection.get().add(this); + getElement().getStyle().setPosition(Style.Position.RELATIVE); redraw(); } - @Override - protected void onUnload() { - ResizableWidgetCollection.get().remove(this); - } - /** * Reset the progress text based on the current min and max progress range. */ diff --git a/appinventor/appengine/src/com/google/appinventor/client/utils/Color.java b/appinventor/appengine/src/com/google/appinventor/client/utils/Color.java new file mode 100644 index 00000000000..f1082be6fac --- /dev/null +++ b/appinventor/appengine/src/com/google/appinventor/client/utils/Color.java @@ -0,0 +1,20 @@ +package com.google.appinventor.client.utils; + +public class Color { + public static final Color BLACK = new Color(0, 0, 0); + + private final String color; + + public Color(int r, int g, int b) { + this.color = "rgb(" + r + "," + g + "," + b + ")"; + } + + public Color(int r, int g, int b, float a) { + this.color = "rgba(" + r + "," + g + "," + b + "," + a + ")"; + } + + @Override + public String toString() { + return color; + } +} diff --git a/appinventor/lib/gwt_incubator/LICENSE-2.0 b/appinventor/lib/gwt_incubator/LICENSE-2.0 deleted file mode 100644 index d6456956733..00000000000 --- a/appinventor/lib/gwt_incubator/LICENSE-2.0 +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/appinventor/lib/gwt_incubator/README b/appinventor/lib/gwt_incubator/README deleted file mode 100644 index 6bb14959ede..00000000000 --- a/appinventor/lib/gwt_incubator/README +++ /dev/null @@ -1,7 +0,0 @@ -This library comes from http://code.google.com/p/google-web-toolkit-incubator/. The web page says: -The Google Web Toolkit Incubator project is deprecated and is no longer supported by the GWT team. - -Most of the important widgets and APIs made their way into GWT trunk a long time ago. The rest may be included at a later date. - -App Inventor uses classes from com.google.gwt.widgetideas*.* from this library. We should probably replace them at some point with -non-deprecated classes. diff --git a/appinventor/lib/gwt_incubator/gwt-incubator-20101117-r1766.jar b/appinventor/lib/gwt_incubator/gwt-incubator-20101117-r1766.jar deleted file mode 100644 index 414cd905b47..00000000000 Binary files a/appinventor/lib/gwt_incubator/gwt-incubator-20101117-r1766.jar and /dev/null differ