From: Jouni Koivuviita <jouni.koivuviita@itmill.com>
Date: Wed, 24 Oct 2007 10:02:40 +0000 (+0000)
Subject: Java 1.4.2 compliance.
X-Git-Tag: 6.7.0.beta1~5780
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dbf8cb6486fe7195746890440d5de432680d348e;p=vaadin-framework.git

Java 1.4.2 compliance.

svn changeset:2590/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/tests/TestBench.java b/src/com/itmill/toolkit/tests/TestBench.java
index f792ad1d7c..f3ed3b3cf1 100644
--- a/src/com/itmill/toolkit/tests/TestBench.java
+++ b/src/com/itmill/toolkit/tests/TestBench.java
@@ -66,13 +66,13 @@ public class TestBench extends com.itmill.toolkit.Application implements
 						continue;
 					try {
 						testables.addItem(t);
-						itemCaptions.put(t, t.getSimpleName());
+						itemCaptions.put(t, t.getName());
 						testables.setParent(t, testablePackages[p]);
 						continue;
 					} catch (Exception e) {
 						try {
 							testables.addItem(t);
-							itemCaptions.put(t, t.getSimpleName());
+							itemCaptions.put(t, t.getName());
 							testables.setParent(t, testablePackages[p]);
 							continue;
 						} catch (Exception e1) {
@@ -90,7 +90,7 @@ public class TestBench extends com.itmill.toolkit.Application implements
 		// simplify captions
 		for (Iterator i = itemCaptions.keySet().iterator(); i.hasNext();) {
 			Class testable = (Class) i.next();
-			menu.setItemCaption(testable, testable.getSimpleName());
+			menu.setItemCaption(testable, testable.getName());
 		}
 		menu.addListener(this);
 		menu.setImmediate(true);
@@ -136,7 +136,7 @@ public class TestBench extends com.itmill.toolkit.Application implements
 		bodyLayout.removeAllComponents();
 		bodyLayout.setCaption(null);
 
-		String title = ((Class) menu.getValue()).getSimpleName();
+		String title = ((Class) menu.getValue()).getName();
 		bodyLayout.setCaption(title);
 		bodyLayout.addComponent(createTestable((Class) menu.getValue()));
 	}
diff --git a/src/com/itmill/toolkit/tests/TestForPreconfiguredComponents.java b/src/com/itmill/toolkit/tests/TestForPreconfiguredComponents.java
index 0bc0a6d4ef..69d06c869b 100644
--- a/src/com/itmill/toolkit/tests/TestForPreconfiguredComponents.java
+++ b/src/com/itmill/toolkit/tests/TestForPreconfiguredComponents.java
@@ -167,7 +167,7 @@ public class TestForPreconfiguredComponents extends CustomComponent implements
 			public void componentEvent(Event event) {
 				status
 						.addComponent(new Label(event.getClass()
-								.getSimpleName()));
+								.getName()));
 				status.addComponent(new Label("selected: "
 						+ event.getSource().toString()));
 			}