Updated to use new ImageBundle.@Resource annotation instead of old-style javadoc @gwt.resource. In RichTextToolbar.java, removed the metadata completely since in every case the image file was already named after the associated method. Also removed an unused local in ShowcaseGenerator.java.
Patch by: bruce
Review by: jlabanca (desk review)
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@2104 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/Application.java b/samples/showcase/src/com/google/gwt/sample/showcase/client/Application.java
index 7a58f49..024c7a7 100644
--- a/samples/showcase/src/com/google/gwt/sample/showcase/client/Application.java
+++ b/samples/showcase/src/com/google/gwt/sample/showcase/client/Application.java
@@ -63,9 +63,9 @@
/**
* An image indicating a leaf.
*
- * @gwt.resource noimage.png
* @return a prototype of this image
*/
+ @Resource("noimage.png")
AbstractImagePrototype treeLeaf();
}
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/lists/CwStackPanel.java b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/lists/CwStackPanel.java
index 7f8d70c..ffc82ec 100644
--- a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/lists/CwStackPanel.java
+++ b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/lists/CwStackPanel.java
@@ -92,9 +92,8 @@
/**
* Use noimage.png, which is a blank 1x1 image.
- *
- * @gwt.resource noimage.png
*/
+ @Resource("noimage.png")
AbstractImagePrototype treeLeaf();
}
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/text/RichTextToolbar.java b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/text/RichTextToolbar.java
index ae064b6..d9346d4 100644
--- a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/text/RichTextToolbar.java
+++ b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/text/RichTextToolbar.java
@@ -46,94 +46,40 @@
*/
public interface Images extends ImageBundle {
- /**
- * @gwt.resource bold.gif
- */
AbstractImagePrototype bold();
- /**
- * @gwt.resource createLink.gif
- */
AbstractImagePrototype createLink();
- /**
- * @gwt.resource hr.gif
- */
AbstractImagePrototype hr();
- /**
- * @gwt.resource indent.gif
- */
AbstractImagePrototype indent();
- /**
- * @gwt.resource insertImage.gif
- */
AbstractImagePrototype insertImage();
- /**
- * @gwt.resource italic.gif
- */
AbstractImagePrototype italic();
- /**
- * @gwt.resource justifyCenter.gif
- */
AbstractImagePrototype justifyCenter();
- /**
- * @gwt.resource justifyLeft.gif
- */
AbstractImagePrototype justifyLeft();
- /**
- * @gwt.resource justifyRight.gif
- */
AbstractImagePrototype justifyRight();
- /**
- * @gwt.resource ol.gif
- */
AbstractImagePrototype ol();
- /**
- * @gwt.resource outdent.gif
- */
AbstractImagePrototype outdent();
- /**
- * @gwt.resource removeFormat.gif
- */
AbstractImagePrototype removeFormat();
- /**
- * @gwt.resource removeLink.gif
- */
AbstractImagePrototype removeLink();
- /**
- * @gwt.resource strikeThrough.gif
- */
AbstractImagePrototype strikeThrough();
- /**
- * @gwt.resource subscript.gif
- */
AbstractImagePrototype subscript();
- /**
- * @gwt.resource superscript.gif
- */
AbstractImagePrototype superscript();
- /**
- * @gwt.resource ul.gif
- */
AbstractImagePrototype ul();
- /**
- * @gwt.resource underline.gif
- */
AbstractImagePrototype underline();
}
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/generator/ShowcaseGenerator.java b/samples/showcase/src/com/google/gwt/sample/showcase/generator/ShowcaseGenerator.java
index dd5be6d..79dd3b4 100644
--- a/samples/showcase/src/com/google/gwt/sample/showcase/generator/ShowcaseGenerator.java
+++ b/samples/showcase/src/com/google/gwt/sample/showcase/generator/ShowcaseGenerator.java
@@ -114,7 +114,6 @@
// Get a full list of properties from the default file
List<String> propNames = new ArrayList<String>();
String filename = SRC_PROP + "ShowcaseConstants.properties";
- StringBuffer fileContentsBuf = new StringBuffer();
BufferedReader br = null;
try {
br = new BufferedReader(new FileReader(filename));
