From b20614d1c1551e5de08d4e4b1d0719c739d7374d Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 7 Oct 2010 10:28:45 +0000 Subject: [PATCH] Fixed remaining warnings in /tests (#5749) svn changeset:15444/svn branch:6.5 --- tests/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java | 2 +- .../com/vaadin/tests/layouts/TestLayoutClickListeners.java | 5 +++-- .../server/applicationservlet/TestStaticFilesLocation.java | 2 +- tests/src/com/vaadin/tests/tickets/Ticket1804.java | 4 +--- tests/src/com/vaadin/tests/tickets/Ticket2232.java | 2 +- tests/src/com/vaadin/tests/tickets/Ticket2998.java | 2 +- tests/src/com/vaadin/tests/tickets/Ticket677.java | 3 +-- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/tests/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java b/tests/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java index 2888972d25..1fda9bafca 100644 --- a/tests/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java +++ b/tests/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java @@ -149,7 +149,7 @@ public class TestAbsoluteLayout extends TestBase { .next(); Item item = container.addItem(next); - String caption = next.getTag(); + String caption = next.getClass().getSimpleName(); caption += "; cap: " + next.getCaption() + "; debugid" + getDebugId(); diff --git a/tests/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java b/tests/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java index c6891e9d68..93c51d6b4a 100644 --- a/tests/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java +++ b/tests/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java @@ -2,6 +2,7 @@ package com.vaadin.tests.layouts; import com.vaadin.event.LayoutEvents.LayoutClickEvent; import com.vaadin.event.LayoutEvents.LayoutClickListener; +import com.vaadin.event.MouseEvents.ClickEvent; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.tests.util.Log; import com.vaadin.ui.AbsoluteLayout; @@ -141,9 +142,9 @@ public class TestLayoutClickListeners extends AbstractTestCase { } } String button = "left"; - if (event.getButton() == event.BUTTON_RIGHT) { + if (event.getButton() == ClickEvent.BUTTON_RIGHT) { button = "right"; - } else if (event.getButton() == event.BUTTON_MIDDLE) { + } else if (event.getButton() == ClickEvent.BUTTON_MIDDLE) { button = "middle"; } diff --git a/tests/src/com/vaadin/tests/server/applicationservlet/TestStaticFilesLocation.java b/tests/src/com/vaadin/tests/server/applicationservlet/TestStaticFilesLocation.java index ed743ccedc..29ef40e546 100644 --- a/tests/src/com/vaadin/tests/server/applicationservlet/TestStaticFilesLocation.java +++ b/tests/src/com/vaadin/tests/server/applicationservlet/TestStaticFilesLocation.java @@ -54,7 +54,7 @@ public class TestStaticFilesLocation extends TestCase { return null; } - public Enumeration getInitParameterNames() { + public Enumeration getInitParameterNames() { return new Enumeration() { public boolean hasMoreElements() { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1804.java b/tests/src/com/vaadin/tests/tickets/Ticket1804.java index f1c37ac785..265f3041e9 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1804.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1804.java @@ -5,7 +5,6 @@ import java.util.LinkedList; import com.vaadin.data.Validator; import com.vaadin.data.util.MethodProperty; -import com.vaadin.terminal.Sizeable; import com.vaadin.terminal.SystemError; import com.vaadin.ui.AbstractField; import com.vaadin.ui.Button; @@ -107,8 +106,7 @@ public class Ticket1804 extends com.vaadin.Application { Window w = new Window("Status of the fields"); w.setModal(true); w.setScrollable(true); - w.setHeight("80px"); - w.setHeightUnits(Sizeable.UNITS_PERCENTAGE); + w.setHeight("80%"); w.addComponent(new Label(msg.toString(), Label.CONTENT_XHTML)); main.addWindow(w); } diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2232.java b/tests/src/com/vaadin/tests/tickets/Ticket2232.java index 848d3c8e3d..6df6717c33 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2232.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2232.java @@ -66,7 +66,7 @@ public class Ticket2232 extends Application { } String caption = gl.getClass().getSimpleName(); caption += " style: " + gl.getStyleName() + ", spacingFromServer:" - + ((SpacingHandler) gl).isSpacingEnabled(); + + ((SpacingHandler) gl).isSpacing(); gl.setCaption(caption); getMainWindow().addComponent(gl); } diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2998.java b/tests/src/com/vaadin/tests/tickets/Ticket2998.java index 88ee6dcc55..81ffcf5a01 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2998.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2998.java @@ -110,7 +110,7 @@ public class Ticket2998 extends Application { super("Edit workout"); workoutLog = app; Layout main = new VerticalLayout(); - setLayout(main); + setContent(main); main.setSizeUndefined(); main.setStyleName(Reindeer.PANEL_LIGHT); diff --git a/tests/src/com/vaadin/tests/tickets/Ticket677.java b/tests/src/com/vaadin/tests/tickets/Ticket677.java index d288168d7c..ee7320e59b 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket677.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket677.java @@ -5,7 +5,6 @@ import com.vaadin.data.Container; import com.vaadin.data.Item; import com.vaadin.data.Property; import com.vaadin.data.util.BeanItem; -import com.vaadin.ui.BaseFieldFactory; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; @@ -109,7 +108,7 @@ public class Ticket677 extends Application { form = new Form(); form.setCaption("Enabled"); - form.setFieldFactory(new BaseFieldFactory() { + form.setFormFieldFactory(new DefaultFieldFactory() { @Override public Field createField(Item item, Object propertyId, -- 2.39.5