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 f792ad1d7cd3ec8d056ce3c6cc21a7cdae604440..f3ed3b3cf1f4fb7425e4204678449049c1d61a49 100644 (file)
--- 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 0bc0a6d4efbf9baa792f625548db746734db0238..69d06c869b2c66c3e48798527d2e9d016c184f65 100644 (file)
--- 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()));
                        }