Revision: 6863 Author: [email protected] Date: Wed Nov 11 20:55:14 2009 Log: Add Eclipse project/etc files for MissingPlugin app, add supported platforms for all-downloads page, formatting cleanups.
Patch by: jat Review by: bruce http://code.google.com/p/google-web-toolkit/source/detail?r=6863 Added: /releases/2.0/eclipse/plugins /releases/2.0/eclipse/plugins/MissingPlugin /releases/2.0/eclipse/plugins/MissingPlugin/.checkstyle /releases/2.0/eclipse/plugins/MissingPlugin/.classpath /releases/2.0/eclipse/plugins/MissingPlugin/.project /releases/2.0/eclipse/plugins/MissingPlugin/MissingPlugin-gwtc.launch /releases/2.0/eclipse/plugins/MissingPlugin/MissingPlugin.launch Modified: /releases/2.0/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/AllDownloadsPane.java /releases/2.0/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/AllDownloadsPane.ui.xml /releases/2.0/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/DownloadEntry.java /releases/2.0/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/MissingPlugin.java /releases/2.0/plugins/MissingPlugin/war/MissingPlugin.html ======================================= --- /dev/null +++ /releases/2.0/eclipse/plugins/MissingPlugin/.checkstyle Wed Nov 11 20:55:14 2009 @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="false"> + <fileset name="all" enabled="true" check-config-name="GWT Checks" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> ======================================= --- /dev/null +++ /releases/2.0/eclipse/plugins/MissingPlugin/.classpath Wed Nov 11 20:55:14 2009 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="core/src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry combineaccessrules="false" kind="src" path="/gwt-dev"/> + <classpathentry combineaccessrules="false" kind="src" path="/gwt-user"/> + <classpathentry kind="output" path="bin"/> +</classpath> ======================================= --- /dev/null +++ /releases/2.0/eclipse/plugins/MissingPlugin/.project Wed Nov 11 20:55:14 2009 @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>MissingPlugin</name> + <comment>MissingPlugin project</comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> + </natures> + <linkedResources> + <link> + <name>core</name> + <type>2</type> + <locationURI>GWT_ROOT/plugins/MissingPlugin/</locationURI> + </link> + </linkedResources> +</projectDescription> ======================================= --- /dev/null +++ /releases/2.0/eclipse/plugins/MissingPlugin/MissingPlugin-gwtc.launch Wed Nov 11 20:55:14 2009 @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/gwt-dev-linux/core/src/com/google/gwt/dev/Compiler.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> +<listAttribute key="org.eclipse.jdt.launching.CLASSPATH"> +<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="MissingPlugin" path="1" type="4"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/MissingPlugin/src" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/gwt-user/core/src" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/gwt-user/core/super" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/gwt-dev/core/super" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="MissingPlugin"/> </runtimeClasspathEntry> "/> +</listAttribute> +<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.Compiler"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="com.google.gwt.sample.showcase.MissingPlugin"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MissingPlugin"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Xmx256M -Dgwt.devjar=${gwt_devjar}"/> +</launchConfiguration> ======================================= --- /dev/null +++ /releases/2.0/eclipse/plugins/MissingPlugin/MissingPlugin.launch Wed Nov 11 20:55:14 2009 @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/gwt-dev/core/src/com/google/gwt/dev/DevMode.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> +<listAttribute key="org.eclipse.jdt.launching.CLASSPATH"> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="MissingPlugin" path="1" type="4"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/MissingPlugin/core/src" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/gwt-user/core/src" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/gwt-user/core/super" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/gwt-dev/core/super" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="MissingPlugin"/> </runtimeClasspathEntry> "/> +</listAttribute> +<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-startupUrl MissingPlugin.html com.google.gwt.missingplugin.MissingPlugin"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MissingPlugin"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Xmx256M -Dgwt.devjar=${gwt_devjar}"/> +</launchConfiguration> ======================================= --- /releases/2.0/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/AllDownloadsPane.java Mon Nov 9 21:01:39 2009 +++ /releases/2.0/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/AllDownloadsPane.java Wed Nov 11 20:55:14 2009 @@ -18,6 +18,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.JsArray; import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.resources.client.CssResource; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.uibinder.client.UiHandler; @@ -36,6 +37,13 @@ interface DownloadListPaneBinder extends UiBinder<Widget, AllDownloadsPane> { } + interface MyStyle extends CssResource { + String platforms(); + } + + @UiField + MyStyle style; + @UiField VerticalPanel downloadBoxes; @@ -54,6 +62,11 @@ if (link.isSupported()) { String linkContentHtml = link.getLinkContentHtml(); String href = link.getHref(); + String platforms = link.getPlatforms(); + if (platforms != null) { + linkContentHtml += "<br><span class=\"" + style.platforms() + "\">" + + platforms + "</span>"; + } DownloadBox box = new DownloadBox(linkContentHtml, href, true); downloadBoxes.add(box); downloadBoxes.setCellWidth(box, "100%"); ======================================= --- /releases/2.0/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/AllDownloadsPane.ui.xml Mon Nov 9 21:01:39 2009 +++ /releases/2.0/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/AllDownloadsPane.ui.xml Wed Nov 11 20:55:14 2009 @@ -12,7 +12,7 @@ <!-- implied. License for the specific language governing permissions and --> <!-- limitations under the License. --> <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui"> - <ui:style> + <ui:style type='com.google.gwt.missingplugin.client.AllDownloadsPane.MyStyle'> .pane { } @@ -20,18 +20,23 @@ margin: 10px 0 0 30px; font-size: 100%; } - + .downloadBoxes { } - + .inferredDownloadLink { - margin-top: 2px; + margin-top: 2px; margin-right: 8px; - text-align: right; - font-size: 80%; - display: block; + text-align: right; + font-size: 80%; + display: block; color: black; } + + .platforms { + font-size: 80%; + font-style: italic; + } </ui:style> <g:HTMLPanel styleName="{style.pane}"> @@ -49,4 +54,4 @@ </table> </g:HTMLPanel> -</ui:UiBinder> +</ui:UiBinder> ======================================= --- /releases/2.0/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/DownloadEntry.java Mon Nov 9 21:01:39 2009 +++ /releases/2.0/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/DownloadEntry.java Wed Nov 11 20:55:14 2009 @@ -23,7 +23,7 @@ public final class DownloadEntry extends JavaScriptObject { protected DownloadEntry() { } - + public native String getHref()/*-{ return this.url; }-*/; @@ -31,9 +31,13 @@ public native String getLinkContentHtml()/*-{ return this.caption; }-*/; - - public native boolean isSupported() /*-{ + + public native String getPlatforms()/*-{ + return this.platforms; + }-*/; + + public native boolean isSupported() /*-{ return this.supported; }-*/; - -} + +} ======================================= --- /releases/2.0/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/MissingPlugin.java Mon Nov 9 21:01:39 2009 +++ /releases/2.0/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/MissingPlugin.java Wed Nov 11 20:55:14 2009 @@ -33,7 +33,7 @@ DownloadInfo r = getAmbientLinkInfo0(); assert r != null : "expecting $wnd.downloadInfo"; return r; - }; + } private native DownloadInfo getAmbientLinkInfo0() /*-{ return $wnd.downloadInfo; ======================================= --- /releases/2.0/plugins/MissingPlugin/war/MissingPlugin.html Mon Nov 9 21:01:39 2009 +++ /releases/2.0/plugins/MissingPlugin/war/MissingPlugin.html Wed Nov 11 20:55:14 2009 @@ -19,27 +19,27 @@ <script> var troubleshootingUrl = "http://code.google.com/webtoolkit/doc/1.6/FAQ_Troubleshooting.html";; - + // The missing plugin module expects downloadInfo.inferredDownloadId to contain the key to use // in allDownloads field. var downloadInfo = { "inferredDownloadId" : null, "troubleshootingUrl" : troubleshootingUrl, "allDownloads" : { - "unknown" : + "unknown" : { "caption" : "Regrettably, this browser is currently unsupported :-(", "url" : troubleshootingUrl, "supported" : false }, - - "firefox-old" : + + "firefox-old" : { "caption" : "Sorry, the GWT Developer Plugin only supports Firefox 3.0 and 3.5 at present", "url" : "http://www.getfirefox.com";, "supported" : false }, - + "opera" : { "caption" : "Sorry, there is currently no GWT Developer Plugin for Opera", @@ -47,21 +47,21 @@ "url" : "http://code.google.com/webtoolkit/makinggwtbetter.html#contributingcode";, "supported" : false }, - + "safari-mac-sl" : { "caption" : "Sorry, at the moment, there is not yet a GWT Developer Plugin for Safari on Mac OS X 10.6", "url" : troubleshootingUrl, "supported" : false }, - + "safari-iphone" : { "caption" : "Sorry, there is currently no GWT Developer Plugin for mobile Safari", "url" : troubleshootingUrl, "supported" : false }, - + "webkit-android" : { "caption" : "Sorry, there is currently no GWT Developer Plugin for mobile WebKit", @@ -83,14 +83,14 @@ "supported" : false }, - "chrome-win" : + "chrome-win" : { "caption" : "The GWT Developer Plugin requires Chrome 4 or later,<br>so click here to learn about switching to the Chrome DevChannel to get early access", "url" : "http://dev.chromium.org/getting-involved/dev-channel";, "supported" : false }, - "safari-win" : + "safari-win" : { "caption" : "Sorry, there is currently no GWT Developer Plugin for Safar on Windows", "url" : troubleshootingUrl, @@ -98,9 +98,10 @@ }, "firefox" : - { + { "caption" : "Download the GWT Developer Plugin<br>For Firefox", "url" : "https://dl-ssl.google.com/gwt/plugins/firefox/gwt-dev-plugin.xpi";, + "platforms" : "Win x86, Linux x86/x86_64, Mac x86/PPC", "supported" : true }, @@ -108,20 +109,23 @@ { "caption" : "Download the GWT Developer Plugin<br>For Internet Explorer", "url" : "http://google-web-toolkit.googlecode.com/svn/trunk/plugins/ie/prebuilt/GwtDevModeIePluginInstaller.msi";, + "platforms" : "Win x86", "supported" : true }, - - "chrome4-win" : + + "chrome4-win" : { "caption" : "Download the GWT Developer Plugin<br>For Chrome", - "url" : "http://google-web-toolkit.googlecode.com/svn/trunk/plugins/npapi/prebuilt/gwtdmp.crx";, + "url" : "https://dl-ssl.google.com/gwt/plugins/chrome/gwt-dev-plugin.crx";, + "platforms" : "Win x86", "supported" : true }, - - "safari-mac" : + + "safari-mac" : { "caption" : "Download the GWT Developer Plugin<br>For Safari", "url" : "http://google-web-toolkit.googlecode.com/svn/trunk/plugins/webkit/prebuilt/oophm.dmg";, + "platforms" : "Mac x86/PPC", "supported" : true } } @@ -170,17 +174,17 @@ id = 'firefox-old'; } } - downloadInfo.inferredDownloadId = id; - </script> - + downloadInfo.inferredDownloadId = id; + </script> + <script type="text/javascript" language="javascript" src="missingplugin/missingplugin.nocache.js"></script> </head> <noscript> <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif"> - The Google Web Toolkit Developer Plugin does not appear to be installed. - However, you also don't seem to have a browser that is willing to run JavaScript. - Please enable JavaScript or switch to a browser that supports JavaScript and try again. + The Google Web Toolkit Developer Plugin does not appear to be installed. + However, you also don't seem to have a browser that is willing to run JavaScript. + Please enable JavaScript or switch to a browser that supports JavaScript and try again. </div> </noscript> </body> -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
