2007-01-11 Andreas Tobler <a.tobler@schweiz.org>

	* examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java
	(AicasGraphicsBenchmark): Load images from ../icons.
	* examples/gnu/classpath/examples/java2d/J2dBenchmark.java (init):
	Likewise.
	* examples/Makefile.am (EXAMPLE_ICONS): Add rule to copy *.gif files
	to icons.
	* examples/gnu/classpath/examples/awt/aicas.png: Move to ../icons.
	Delete here.
	* examples/gnu/classpath/examples/awt/palme.gif: Likewise.
	* examples/gnu/classpath/examples/java2d/aicas.png: Likewise.
	* examples/gnu/classpath/examples/java2d/palme.gif: Likewise.
	* examples/gnu/classpath/examples/icons/aicas.png: Moved.
	* examples/gnu/classpath/examples/icons/palme.gif: Likewise.

8 files changed, 21 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index e97f500cf..2e58044d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2007-01-11  Andreas Tobler  <a.tobler@schweiz.org>
+
+	* examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java
+	(AicasGraphicsBenchmark): Load images from ../icons.
+	* examples/gnu/classpath/examples/java2d/J2dBenchmark.java (init):
+	Likewise.
+	* examples/Makefile.am (EXAMPLE_ICONS): Add rule to copy *.gif files
+	to icons.
+	* examples/gnu/classpath/examples/awt/aicas.png: Move to ../icons.
+	Delete here.
+	* examples/gnu/classpath/examples/awt/palme.gif: Likewise.
+	* examples/gnu/classpath/examples/java2d/aicas.png: Likewise.
+	* examples/gnu/classpath/examples/java2d/palme.gif: Likewise.
+	* examples/gnu/classpath/examples/icons/aicas.png: Moved.
+	* examples/gnu/classpath/examples/icons/palme.gif: Likewise.
+
 2007-01-09  Tania Bento  <tbento@redhat.com>
 
 	* java/security/Permission.java:
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 4e61fcef5..8d619e14d 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -35,6 +35,7 @@ BUILT_SOURCES = $(EXAMPLE_ZIP)
 
 # the png icons we use in some of the examples.
 EXAMPLE_ICONS = $(srcdir)/gnu/classpath/examples/icons/*.png
+EXAMPLE_ICONS += $(srcdir)/gnu/classpath/examples/icons/*.gif
 
 # the html pages we use in the swing demo example.
 EXAMPLE_HTML = $(srcdir)/gnu/classpath/examples/swing/*.html
diff --git a/examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java b/examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java
index ed18fd4c2..5bb4ec48a 100644
--- a/examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java
+++ b/examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java
@@ -100,8 +100,8 @@ public class AicasGraphicsBenchmark extends Panel
 
   public AicasGraphicsBenchmark()
   {
-    pngTestImage = loadImage("aicas.png");
-    gifTestImage = loadImage("palme.gif");
+    pngTestImage = loadImage("../icons/aicas.png");
+    gifTestImage = loadImage("../icons/palme.gif");
 
     setLayout(new BorderLayout());
     testLabel = new Label();
diff --git a/examples/gnu/classpath/examples/awt/aicas.png b/examples/gnu/classpath/examples/icons/aicas.png
index dcf39654b..dcf39654b 100644
--- a/examples/gnu/classpath/examples/awt/aicas.png
+++ b/examples/gnu/classpath/examples/icons/aicas.png
diff --git a/examples/gnu/classpath/examples/awt/palme.gif b/examples/gnu/classpath/examples/icons/palme.gif
index 694794655..694794655 100644
--- a/examples/gnu/classpath/examples/awt/palme.gif
+++ b/examples/gnu/classpath/examples/icons/palme.gif
diff --git a/examples/gnu/classpath/examples/java2d/J2dBenchmark.java b/examples/gnu/classpath/examples/java2d/J2dBenchmark.java
index 118ae2463..6d3591808 100644
--- a/examples/gnu/classpath/examples/java2d/J2dBenchmark.java
+++ b/examples/gnu/classpath/examples/java2d/J2dBenchmark.java
@@ -174,8 +174,8 @@ public class J2dBenchmark
   public String init()
   {
     boolean loadError = false;
-    pngTestImage = loadImage("aicas.png");
-    gifTestImage = loadImage("palme.gif");
+    pngTestImage = loadImage("../icons/aicas.png");
+    gifTestImage = loadImage("../icons/palme.gif");
 
     if (texture != null)
       {
diff --git a/examples/gnu/classpath/examples/java2d/aicas.png b/examples/gnu/classpath/examples/java2d/aicas.png
deleted file mode 100644
index dcf39654b..000000000
--- a/examples/gnu/classpath/examples/java2d/aicas.png
+++ /dev/null
diff --git a/examples/gnu/classpath/examples/java2d/palme.gif b/examples/gnu/classpath/examples/java2d/palme.gif
deleted file mode 100644
index 694794655..000000000
--- a/examples/gnu/classpath/examples/java2d/palme.gif
+++ /dev/null