From cee4e3e1f79dc97d18bdff6b42bfb85757886744 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 7 Oct 2010 08:13:32 +0000 Subject: [PATCH] Fixed unused variable warnings svn changeset:15439/svn branch:6.5 --- src/com/vaadin/terminal/gwt/client/Util.java | 2 +- .../gwt/client/ui/VAbsoluteLayout.java | 10 ++--- .../terminal/gwt/client/ui/VTextualDate.java | 4 +- .../gwt/client/ui/layout/CellBasedLayout.java | 4 +- .../ui/layout/ChildComponentContainer.java | 9 ++--- .../gwt/server/ApplicationRunnerServlet.java | 26 ++++++------- .../gwt/server/DragAndDropService.java | 3 -- .../combobox/ComboBoxValueUpdate.java | 2 - .../components/menubar/MenuBarNavigation.java | 3 +- .../table/TextFieldRelativeWidth.java | 3 +- .../tests/components/tree/TreeScrolling.java | 7 ++-- .../layouts/layouttester/GridLayoutTests.java | 2 - .../layouttester/HorizontalLayoutTests.java | 3 -- .../layouttester/VerticalLayoutTests.java | 3 -- .../com/vaadin/tests/tickets/Ticket2021.java | 2 - .../com/vaadin/tests/tickets/Ticket2029.java | 1 + .../com/vaadin/tests/tickets/Ticket2048.java | 3 -- .../com/vaadin/tests/tickets/Ticket2204.java | 25 ++----------- .../com/vaadin/tests/tickets/Ticket2242.java | 37 ------------------- .../com/vaadin/tests/tickets/Ticket2344.java | 3 -- .../com/vaadin/tests/tickets/Ticket2998.java | 6 --- 21 files changed, 39 insertions(+), 119 deletions(-) diff --git a/src/com/vaadin/terminal/gwt/client/Util.java b/src/com/vaadin/terminal/gwt/client/Util.java index da1d9ce43e..5afbd2f15c 100644 --- a/src/com/vaadin/terminal/gwt/client/Util.java +++ b/src/com/vaadin/terminal/gwt/client/Util.java @@ -324,7 +324,7 @@ public class Util { public static int measureHorizontalBorder(Element element) { int borders; - int cw = element.getClientWidth(); + // element.getClientWidth(); if (BrowserInfo.get().isIE()) { String width = element.getStyle().getProperty("width"); String height = element.getStyle().getProperty("height"); diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java index af856d047c..50e33c4c19 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java @@ -45,9 +45,9 @@ public class VAbsoluteLayout extends ComplexPanel implements Container { protected final Element canvas = DOM.createDiv(); - private int excessPixelsHorizontal; - - private int excessPixelsVertical; + // private int excessPixelsHorizontal; + // + // private int excessPixelsVertical; private Object previousStyleName; @@ -199,8 +199,8 @@ public class VAbsoluteLayout extends ComplexPanel implements Container { public void setStyleName(String style) { super.setStyleName(style); if (previousStyleName == null || !previousStyleName.equals(style)) { - excessPixelsHorizontal = -1; - excessPixelsVertical = -1; + // excessPixelsHorizontal = -1; + // excessPixelsVertical = -1; } } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java b/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java index df5a0a1db6..892d2b0851 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java @@ -135,8 +135,8 @@ public class VTextualDate extends VDateField implements Paintable, Field, String frmString = LocaleService .getDateFormat(currentLocale); frmString = cleanFormat(frmString); - String delim = LocaleService - .getClockDelimiter(currentLocale); + // String delim = LocaleService + // .getClockDelimiter(currentLocale); if (currentResolution >= RESOLUTION_HOUR) { if (dts.isTwelveHourClock()) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java b/src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java index f573e36e09..64b1ea5f69 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java @@ -342,8 +342,8 @@ public abstract class CellBasedLayout extends ComplexPanel implements Container throw new NullPointerException(); } } - ChildComponentContainer remove = widgetToComponentContainer - .remove(widget); + // ChildComponentContainer remove = + widgetToComponentContainer.remove(widget); remove(child); if (!relocated) { Paintable p = (Paintable) widget; diff --git a/src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java b/src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java index babb00c61b..bcb972ca6a 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java +++ b/src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java @@ -9,7 +9,6 @@ import java.util.NoSuchElementException; import com.google.gwt.dom.client.DivElement; import com.google.gwt.dom.client.Document; import com.google.gwt.dom.client.Element; -import com.google.gwt.dom.client.Style; import com.google.gwt.dom.client.TableElement; import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.Widget; @@ -51,7 +50,7 @@ public class ChildComponentContainer extends Panel { private double expandRatio; - private int containerMarginLeft = 0; + // private int containerMarginLeft = 0; private int containerMarginTop = 0; AlignmentInfo alignment = AlignmentInfo.TOP_LEFT; @@ -80,7 +79,7 @@ public class ChildComponentContainer extends Panel { widgetDIV = Document.get().createDivElement(); if (BrowserInfo.get().isFF2()) { - Style style = widgetDIV.getStyle(); + // Style style = widgetDIV.getStyle(); // FF2 chokes on some floats very easily. Measuring size escpecially // becomes terribly slow TableElement tableEl = Document.get().createTableElement(); @@ -174,7 +173,7 @@ public class ChildComponentContainer extends Panel { // setWidth("0px"); contSize.setHeight(0); contSize.setWidth(0); - containerMarginLeft = 0; + // containerMarginLeft = 0; containerMarginTop = 0; containerDIV.getStyle().setProperty("paddingLeft", "0"); containerDIV.getStyle().setProperty("paddingTop", "0"); @@ -234,7 +233,7 @@ public class ChildComponentContainer extends Panel { } public void setMarginLeft(int marginLeft) { - containerMarginLeft = marginLeft; + // containerMarginLeft = marginLeft; containerDIV.getStyle().setPropertyPx("paddingLeft", marginLeft); } diff --git a/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java index 2b21f121d3..b30866441c 100644 --- a/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java +++ b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java @@ -82,9 +82,9 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet { private static class URIS { String staticFilesPath; - String applicationURI; - String context; - String runner; + // String applicationURI; + // String context; + // String runner; String applicationClassname; } @@ -108,38 +108,38 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet { final String[] urlParts = request.getRequestURI().toString() .split("\\/"); String context = null; - String runner = null; + // String runner = null; URIS uris = new URIS(); String applicationClassname = null; String contextPath = request.getContextPath(); if (urlParts[1].equals(contextPath.replaceAll("\\/", ""))) { // class name comes after web context and runner application context = urlParts[1]; - runner = urlParts[2]; + // runner = urlParts[2]; if (urlParts.length == 3) { throw new IllegalArgumentException("No application specified"); } applicationClassname = urlParts[3]; uris.staticFilesPath = "/" + context; - uris.applicationURI = "/" + context + "/" + runner + "/" - + applicationClassname; - uris.context = context; - uris.runner = runner; + // uris.applicationURI = "/" + context + "/" + runner + "/" + // + applicationClassname; + // uris.context = context; + // uris.runner = runner; uris.applicationClassname = applicationClassname; } else { // no context context = ""; - runner = urlParts[1]; + // runner = urlParts[1]; if (urlParts.length == 2) { throw new IllegalArgumentException("No application specified"); } applicationClassname = urlParts[2]; uris.staticFilesPath = "/"; - uris.applicationURI = "/" + runner + "/" + applicationClassname; - uris.context = context; - uris.runner = runner; + // uris.applicationURI = "/" + runner + "/" + applicationClassname; + // uris.context = context; + // uris.runner = runner; uris.applicationClassname = applicationClassname; } return uris; diff --git a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java b/src/com/vaadin/terminal/gwt/server/DragAndDropService.java index a741d6dfed..0043679c75 100644 --- a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java +++ b/src/com/vaadin/terminal/gwt/server/DragAndDropService.java @@ -24,8 +24,6 @@ public class DragAndDropService implements VariableOwner { private int lastVisitId; - private int currentEventId; - private boolean lastVisitAccepted = false; private DragAndDropEvent dragEvent; @@ -159,7 +157,6 @@ public class DragAndDropService implements VariableOwner { private Transferable constructTransferable(DropTarget dropHandlerOwner, Map variables) { int eventId = (Integer) variables.get("eventId"); - currentEventId = eventId; final Component sourceComponent = (Component) variables .get("component"); diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java b/tests/src/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java index 75cefe9360..b8f7a9758d 100644 --- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java +++ b/tests/src/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java @@ -12,8 +12,6 @@ public class ComboBoxValueUpdate extends TestBase { return 2451; } - private Label selectedLabel; - @Override protected String getDescription() { return "Testcase for ComboBox. Test especially edge values(of page changes) when selecting items with keyboard only."; diff --git a/tests/src/com/vaadin/tests/components/menubar/MenuBarNavigation.java b/tests/src/com/vaadin/tests/components/menubar/MenuBarNavigation.java index f9f56ddbfe..54b2f986a4 100644 --- a/tests/src/com/vaadin/tests/components/menubar/MenuBarNavigation.java +++ b/tests/src/com/vaadin/tests/components/menubar/MenuBarNavigation.java @@ -10,7 +10,6 @@ public class MenuBarNavigation extends TestBase implements Command { private MenuItem edit; private MenuItem file; - private MenuItem help; private Log log; private MenuItem export; @@ -30,7 +29,7 @@ public class MenuBarNavigation extends TestBase implements Command { edit.addItem("Copy", this); edit.addItem("Cut", this); edit.addItem("Paste", this); - help = mb.addItem("Help", this); + mb.addItem("Help", this); addComponent(mb); diff --git a/tests/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.java b/tests/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.java index a2c96d291a..13ca9f8cf3 100644 --- a/tests/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.java +++ b/tests/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.java @@ -57,7 +57,8 @@ public class TextFieldRelativeWidth extends TestBase { public void valueChange( com.vaadin.data.Property.ValueChangeEvent event) { - IndexedContainer idc = (IndexedContainer) getContainerDataSource(); + // IndexedContainer idc = (IndexedContainer) + // getContainerDataSource(); } diff --git a/tests/src/com/vaadin/tests/components/tree/TreeScrolling.java b/tests/src/com/vaadin/tests/components/tree/TreeScrolling.java index 4406f1c68d..38bf07ef59 100644 --- a/tests/src/com/vaadin/tests/components/tree/TreeScrolling.java +++ b/tests/src/com/vaadin/tests/components/tree/TreeScrolling.java @@ -1,6 +1,5 @@ package com.vaadin.tests.components.tree; -import com.vaadin.data.Item; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.RichTextArea; import com.vaadin.ui.TextField; @@ -22,10 +21,12 @@ public class TreeScrolling extends AbstractTestCase { Tree tree = new Tree(); for (int i = 0; i < 20; i++) { String parentId = "Item " + i; - Item parentItem = tree.addItem(parentId); + // Item parentItem = + tree.addItem(parentId); for (int j = 0; j < 20; j++) { String subId = "Item " + i + " - " + j; - Item subItem = tree.addItem(subId); + // Item subItem = + tree.addItem(subId); tree.setParent(subId, parentId); } diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java b/tests/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java index d8ee2e46b9..8985f1cf97 100644 --- a/tests/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java +++ b/tests/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java @@ -30,12 +30,10 @@ import com.vaadin.ui.themes.Reindeer; public class GridLayoutTests extends AbstractLayoutTests { - private Application application; private AbstractComponent rc1, col1, col2, col3, row1, row2, row3, x3, x22; public GridLayoutTests(Application application) { super(); - this.application = application; } @Override diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java b/tests/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java index 711469e79e..9db1f7f44f 100644 --- a/tests/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java +++ b/tests/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java @@ -26,11 +26,8 @@ import com.vaadin.ui.themes.Reindeer; public class HorizontalLayoutTests extends AbstractLayoutTests { - private Application application; - public HorizontalLayoutTests(Application application) { super(); - this.application = application; } @Override diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java b/tests/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java index 6edd121576..cb52ab1051 100644 --- a/tests/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java +++ b/tests/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java @@ -25,11 +25,8 @@ import com.vaadin.ui.VerticalLayout; public class VerticalLayoutTests extends AbstractLayoutTests { - private Application application; - public VerticalLayoutTests(Application application) { super(); - this.application = application; } @Override diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2021.java b/tests/src/com/vaadin/tests/tickets/Ticket2021.java index 9a12387464..7cc1e49f69 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2021.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2021.java @@ -24,8 +24,6 @@ public class Ticket2021 extends Application { + "Nulla nisi. Sed blandit, ante vitae sagittis volutpat, arcu mauris vehicula risus, vitae posuere felis lectus sit amet purus. Donec nec magna et leo eleifend scelerisque. Suspendisse condimentum pharetra ligula. Curabitur lorem. Pellentesque a augue sit amet enim fermentum placerat. Phasellus ante risus, molestie at, iaculis at, pellentesque non, tellus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Phasellus non urna eget risus tempus imperdiet. Integer est diam, sagittis sit amet, posuere sit amet, bibendum sed, lacus. Aenean adipiscing cursus ipsum. Quisque at elit. Vestibulum vitae nunc. Praesent placerat metus viverra lorem. Cras nec elit congue nisi faucibus feugiat. Nam eget mi. Vestibulum condimentum. Nunc nisl ante, cursus in, dictum ac, lobortis rutrum, mi. Nulla eu nisi. In ultricies vehicula magna." + "Nunc eros dui, elementum at, ullamcorper eget, varius at, velit. Ut dictum. Cras ullamcorper ante vel tortor. Quisque viverra mauris vulputate quam. Nulla dui. Suspendisse non eros at ipsum faucibus hendrerit. Morbi dignissim pharetra tortor. Etiam malesuada. Mauris lacinia elementum erat. Duis mollis placerat metus. Nunc risus felis, cursus ac, cursus vel, convallis vel, metus. Ut vehicula nibh et nulla. Vivamus id pede. Quisque egestas arcu a ligula. Maecenas vehicula. Quisque sed ligula quis tellus tempus rutrum. Curabitur vel augue sed orci egestas pharetra. Duis pharetra."; - private AbstractOrderedLayout orderedLayout; - @Override public void init() { Window w = new Window(getClass().getSimpleName()); diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2029.java b/tests/src/com/vaadin/tests/tickets/Ticket2029.java index 5e85d2c595..dc7c3e5c85 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2029.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2029.java @@ -65,6 +65,7 @@ public class Ticket2029 extends Application { return p; } + @SuppressWarnings("unused") private Panel createGLPanel() { Panel p = new Panel("" + DIM1 + "x" + DIM2 + " GridLayout"); p.setWidth("" + DIM1 + "px"); diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2048.java b/tests/src/com/vaadin/tests/tickets/Ticket2048.java index 54546403cd..65b5f73b53 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2048.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2048.java @@ -10,7 +10,6 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Panel; -import com.vaadin.ui.SplitPanel; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; @@ -18,8 +17,6 @@ public class Ticket2048 extends Application { private Embedded embedded; private Panel p; - private SplitPanel splitPanel; - private GridLayout gridLayout; private VerticalLayout orderedLayout; @Override diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2204.java b/tests/src/com/vaadin/tests/tickets/Ticket2204.java index 241907c0be..3fdf61ac47 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2204.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2204.java @@ -6,9 +6,7 @@ import java.util.List; import java.util.Map; import com.vaadin.Application; -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.AbstractOrderedLayout; import com.vaadin.ui.Accordion; @@ -18,8 +16,8 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Component; import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.Field; -import com.vaadin.ui.FieldFactory; import com.vaadin.ui.Form; +import com.vaadin.ui.FormFieldFactory; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; @@ -122,40 +120,25 @@ public class Ticket2204 extends Application { if (c == Form.class) { Form f = (Form) cc; - f.setFieldFactory(new FieldFactory() { - - public Field createField(Class type, Component uiContext) { - return createField(); - } - - public Field createField(Property property, Component uiContext) { - return createField(); - } + f.setFormFieldFactory(new FormFieldFactory() { public Field createField(Item item, Object propertyId, Component uiContext) { - return createField(); - } - - private Field createField() { formTextArea = new RichTextArea(); formTextArea.setVisible(false); return formTextArea; } - public Field createField(Container container, Object itemId, - Object propertyId, Component uiContext) { - return createField(); - } - }); f.setItemDataSource(new BeanItem(new Object() { private int a; + @SuppressWarnings("unused") public int getA() { return a; } + @SuppressWarnings("unused") public void setA(int a) { this.a = a; } diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2242.java b/tests/src/com/vaadin/tests/tickets/Ticket2242.java index 1ddb74187f..fa25ff55f1 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2242.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2242.java @@ -70,43 +70,6 @@ public class Ticket2242 extends Application implements ValueChangeListener { return ic; } - private static class TestObject { - public TestObject(int a, String b, Long c) { - super(); - this.a = a; - this.b = b; - this.c = c; - } - - private int a; - private String b; - private Long c; - - public int getA() { - return a; - } - - public void setA(int a) { - this.a = a; - } - - public String getB() { - return b; - } - - public void setB(String b) { - this.b = b; - } - - public Long getC() { - return c; - } - - public void setC(Long c) { - this.c = c; - } - } - public void valueChange(ValueChangeEvent event) { System.out.println("Value change from " + tableValue + " to " + t.getValue()); diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2344.java b/tests/src/com/vaadin/tests/tickets/Ticket2344.java index b023ed2c14..26ef216940 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2344.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2344.java @@ -4,7 +4,6 @@ import java.util.Random; import com.vaadin.Application; import com.vaadin.ui.Button; -import com.vaadin.ui.Panel; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; @@ -12,8 +11,6 @@ import com.vaadin.ui.themes.BaseTheme; public class Ticket2344 extends Application { - private Panel p; - @Override public void init() { Window main = new Window("Quick test"); diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2998.java b/tests/src/com/vaadin/tests/tickets/Ticket2998.java index 092d9b8b41..88ee6dcc55 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2998.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2998.java @@ -37,7 +37,6 @@ import com.vaadin.ui.themes.Reindeer; */ public class Ticket2998 extends Application { private Table table; - private WorkoutEditor editor = new WorkoutEditor(this); private VerticalLayout mainLayout; public class Workout implements Serializable { @@ -105,7 +104,6 @@ public class Ticket2998 extends Application { private TextField kilomiters = new TextField("Kilometers"); private TextField title = new TextField("Title/note"); - private Workout run; private Ticket2998 workoutLog; public WorkoutEditor(Ticket2998 app) { @@ -137,17 +135,13 @@ public class Ticket2998 extends Application { workoutLog.getMainWindow().addWindow(this); } kilomiters.focus(); - this.run = run; } } } public class MyFieldFactory extends DefaultFieldFactory { - private BeanItemContainer trainingTypes; - public MyFieldFactory(Ticket2998 app) { - trainingTypes = new BeanItemContainer(String.class); } @Override -- 2.39.5