diff options
36 files changed, 50 insertions, 34 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java b/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java index d6fa5f5551..66192489a9 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java @@ -564,8 +564,9 @@ public class VAccordion extends VTabsheetBase implements } @Override - protected Iterator getPaintableIterator() { - return paintables.iterator(); + @SuppressWarnings("unchecked") + protected Iterator<Object> getPaintableIterator() { + return (Iterator) paintables.iterator(); } public boolean hasChildComponent(Widget component) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java index 4ba5d82527..4fce0938ad 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java @@ -20,6 +20,7 @@ import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.Widget; import com.vaadin.terminal.gwt.client.ApplicationConnection; +import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.Container; import com.vaadin.terminal.gwt.client.Focusable; import com.vaadin.terminal.gwt.client.Paintable; @@ -400,7 +401,7 @@ public class VFormLayout extends SimplePanel implements Container { // Workaround for IE weirdness, sometimes returns bad height in some // circumstances when Caption is empty. See #1444 // IE7 bugs more often. I wonder what happens when IE8 arrives... - if (Util.isIE()) { + if (BrowserInfo.get().isIE()) { if (isEmpty) { setHeight("0px"); DOM.setStyleAttribute(getElement(), "overflow", "hidden"); diff --git a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java index 7730247f67..2774a97c98 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java @@ -98,6 +98,7 @@ public class VGridLayout extends SimplePanel implements Paintable, Container { return margin.cast(); } + @SuppressWarnings("unchecked") public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { rendering = true; this.client = client; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTabsheetBase.java b/src/com/vaadin/terminal/gwt/client/ui/VTabsheetBase.java index 159ff62609..5e7f7c4fb4 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VTabsheetBase.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VTabsheetBase.java @@ -107,6 +107,10 @@ abstract class VTabsheetBase extends ComplexPanel implements Container { /** * @return a list of currently shown Paintables + * + * Apparently can be something else than Paintable as + * {@link #updateFromUIDL(UIDL, ApplicationConnection)} checks if + * instanceof Paintable. Therefore set to <Object> */ abstract protected Iterator<Object> getPaintableIterator(); diff --git a/src/com/vaadin/terminal/gwt/client/ui/VUpload.java b/src/com/vaadin/terminal/gwt/client/ui/VUpload.java index b175a50619..4cb7464a80 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VUpload.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VUpload.java @@ -217,7 +217,6 @@ public class VUpload extends SimplePanel implements Paintable { /** * Called by JSNI (hooked via {@link #onloadstrategy}) */ - @SuppressWarnings("unused") private void onSubmitComplete() { /* Needs to be run dereferred to avoid various browser issues. */ DeferredCommand.addCommand(new Command() { diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java index 9154017a32..987a7a2a3e 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java @@ -172,6 +172,7 @@ public class VRichTextToolbar extends Composite { private class EventHandler implements ClickHandler, ChangeHandler, KeyUpHandler { + @SuppressWarnings("deprecation") public void onChange(ChangeEvent event) { Object sender = event.getSource(); if (sender == backColors) { @@ -192,6 +193,7 @@ public class VRichTextToolbar extends Composite { } } + @SuppressWarnings("deprecation") public void onClick(ClickEvent event) { Object sender = event.getSource(); if (sender == bold) { @@ -269,7 +271,9 @@ public class VRichTextToolbar extends Composite { private final EventHandler handler = new EventHandler(); private final RichTextArea richText; + @SuppressWarnings("deprecation") private final RichTextArea.BasicFormatter basic; + @SuppressWarnings("deprecation") private final RichTextArea.ExtendedFormatter extended; private final FlowPanel outer = new FlowPanel(); @@ -305,6 +309,7 @@ public class VRichTextToolbar extends Composite { * @param richText * the rich text area to be controlled */ + @SuppressWarnings("deprecation") public VRichTextToolbar(RichTextArea richText) { this.richText = richText; basic = richText.getBasicFormatter(); @@ -434,6 +439,7 @@ public class VRichTextToolbar extends Composite { /** * Updates the status of all the stateful buttons. */ + @SuppressWarnings("deprecation") private void updateStatus() { if (basic != null) { bold.setDown(basic.isBold()); diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java index 7f5a705e79..8d5d328402 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java @@ -87,7 +87,6 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet private boolean productionMode = false; - @SuppressWarnings("unchecked") @Override public void init(PortletConfig config) throws PortletException { super.init(config); @@ -586,7 +585,6 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet return false; } - @SuppressWarnings("unchecked") private void handleDownload(DownloadStream stream, ResourceRequest request, ResourceResponse response) throws IOException { diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java index cdce3279f0..f461fce404 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java @@ -839,7 +839,6 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements * * @see com.vaadin.terminal.URIHandler */ - @SuppressWarnings("unchecked") private void handleDownload(DownloadStream stream, HttpServletRequest request, HttpServletResponse response) throws IOException { diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java index 01dcffe6fc..0773dca4ec 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java @@ -1039,9 +1039,6 @@ public abstract class AbstractCommunicationManager implements } final VariableOwner owner = getVariableOwner(variable[VAR_PID]); if (owner != null && owner.isEnabled()) { - // TODO this should be Map<String, Object>, but the - // VariableOwner API does not guarantee the key is a - // string Map<String, Object> m; if (nextVariable != null && variable[VAR_PID] @@ -1230,7 +1227,7 @@ public abstract class AbstractCommunicationManager implements * map from variable names to values */ private void handleChangeVariablesError(Application application, - Component owner, Exception e, Map<? extends Object, Object> m) { + Component owner, Exception e, Map<String, Object> m) { boolean handled = false; ChangeVariablesErrorEvent errorEvent = new ChangeVariablesErrorEvent( owner, e, m); @@ -1690,7 +1687,7 @@ public abstract class AbstractCommunicationManager implements } if (componentsRoot.getParent() != null) { // this is a subwindow - componentsRoot = (Window) componentsRoot.getParent(); + componentsRoot = componentsRoot.getParent(); } if (componentsRoot != w) { resultset.remove(p); @@ -1879,6 +1876,7 @@ public abstract class AbstractCommunicationManager implements * should be suppressed, null otherwise. * @see com.vaadin.terminal.URIHandler */ + @SuppressWarnings("deprecation") protected DownloadStream handleURI(Window window, Request request, Response response, Callback callback) { diff --git a/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java index b30866441c..d598b3714f 100644 --- a/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java +++ b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java @@ -145,6 +145,7 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet { return uris; } + @SuppressWarnings("unchecked") @Override protected Class<? extends Application> getApplicationClass() throws ClassNotFoundException { diff --git a/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java b/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java index b19abe163b..089b811662 100644 --- a/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java +++ b/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java @@ -14,10 +14,10 @@ public class ChangeVariablesErrorEvent implements ComponentErrorEvent { private Throwable throwable; private Component component; - private Map variableChanges; + private Map<String, Object> variableChanges; public ChangeVariablesErrorEvent(Component component, Throwable throwable, - Map variableChanges) { + Map<String, Object> variableChanges) { this.component = component; this.throwable = throwable; this.variableChanges = variableChanges; @@ -31,7 +31,7 @@ public class ChangeVariablesErrorEvent implements ComponentErrorEvent { return component; } - public Map getVariableChanges() { + public Map<String, Object> getVariableChanges() { return variableChanges; } diff --git a/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java b/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java index dca9c3f90c..0fce2bdc6a 100644 --- a/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java +++ b/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java @@ -30,7 +30,7 @@ import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -@SuppressWarnings("serial") +@SuppressWarnings({ "serial", "deprecation" }) public class ComponentSizeValidator implements Serializable { private final static int LAYERS_SHOWN = 4; @@ -173,7 +173,6 @@ public class ComponentSizeValidator implements Serializable { subErrors.add(error); } - @SuppressWarnings("deprecation") public void reportErrors(PrintWriter clientJSON, AbstractCommunicationManager communicationManager, PrintStream serverErrorStream) { @@ -402,7 +401,6 @@ public class ComponentSizeValidator implements Serializable { return false; } - @SuppressWarnings("deprecation") public static boolean parentCanDefineHeight(Component component) { Component parent = component.getParent(); if (parent == null) { @@ -502,7 +500,6 @@ public class ComponentSizeValidator implements Serializable { && paintable.getWidthUnits() == Sizeable.UNITS_PERCENTAGE; } - @SuppressWarnings("deprecation") public static boolean parentCanDefineWidth(Component component) { Component parent = component.getParent(); if (parent == null) { diff --git a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java b/src/com/vaadin/terminal/gwt/server/DragAndDropService.java index 0043679c75..a91018ffde 100644 --- a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java +++ b/src/com/vaadin/terminal/gwt/server/DragAndDropService.java @@ -156,8 +156,6 @@ public class DragAndDropService implements VariableOwner { @SuppressWarnings("unchecked") private Transferable constructTransferable(DropTarget dropHandlerOwner, Map<String, Object> variables) { - int eventId = (Integer) variables.get("eventId"); - final Component sourceComponent = (Component) variables .get("component"); diff --git a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java index ee9db805b2..c94fd68473 100644 --- a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java +++ b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java @@ -351,6 +351,7 @@ public class JsonPaintTarget implements PaintTarget { tag.addAttribute("\"" + name + "\":" + (value ? "true" : "false")); } + @SuppressWarnings("deprecation") public void addAttribute(String name, Resource value) throws PaintException { if (value instanceof ExternalResource) { diff --git a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java index 03de2fffd4..fac1f17ba7 100644 --- a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java +++ b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java @@ -26,7 +26,6 @@ import com.vaadin.Application; /** * @author marc */ -@SuppressWarnings({ "serial", "unchecked" }) public class PortletApplicationContext extends WebApplicationContext implements Serializable { diff --git a/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java b/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java index 116667f582..cd9ec3d34b 100644 --- a/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java +++ b/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java @@ -99,7 +99,7 @@ public class WebApplicationContext extends AbstractWebApplicationContext { if (mgr == null) { // Creates new manager - mgr = new CommunicationManager(application, servlet); + mgr = new CommunicationManager(application); applicationToAjaxAppMgrMap.put(application, mgr); } return mgr; diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java b/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java index ea4cbcb663..890c299cc4 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java +++ b/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java @@ -521,6 +521,7 @@ public class ClassPathExplorer { * the collection to which to add server side classes with * {@link ClientWidget} annotation */ + @SuppressWarnings("unchecked") private static void tryToAdd(final String fullclassName, Collection<Class<? extends Paintable>> paintables) { try { diff --git a/src/com/vaadin/ui/AbsoluteLayout.java b/src/com/vaadin/ui/AbsoluteLayout.java index dfa1ab90f4..eca11b7984 100644 --- a/src/com/vaadin/ui/AbsoluteLayout.java +++ b/src/com/vaadin/ui/AbsoluteLayout.java @@ -556,6 +556,7 @@ public class AbsoluteLayout extends AbstractLayout { * @see com.vaadin.ui.AbstractComponent#changeVariables(java.lang.Object, * java.util.Map) */ + @SuppressWarnings("unchecked") @Override public void changeVariables(Object source, Map<String, Object> variables) { super.changeVariables(source, variables); diff --git a/src/com/vaadin/ui/AbstractOrderedLayout.java b/src/com/vaadin/ui/AbstractOrderedLayout.java index 73ab2e81fd..fd7e3a39d4 100644 --- a/src/com/vaadin/ui/AbstractOrderedLayout.java +++ b/src/com/vaadin/ui/AbstractOrderedLayout.java @@ -340,6 +340,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements AlignmentUtils.setComponentAlignment(this, component, alignment); } + @SuppressWarnings("unchecked") @Override public void changeVariables(Object source, Map<String, Object> variables) { super.changeVariables(source, variables); diff --git a/src/com/vaadin/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java index bd0a14a97a..ef09becb00 100644 --- a/src/com/vaadin/ui/AbstractSelect.java +++ b/src/com/vaadin/ui/AbstractSelect.java @@ -426,6 +426,7 @@ public abstract class AbstractSelect extends AbstractField implements // (non-visible items can not be deselected) final Collection<?> visible = getVisibleItemIds(); if (visible != null) { + @SuppressWarnings("unchecked") Set<Object> newsel = (Set<Object>) getValue(); if (newsel == null) { newsel = new HashSet<Object>(); diff --git a/src/com/vaadin/ui/CssLayout.java b/src/com/vaadin/ui/CssLayout.java index c393830165..4f8e00dec4 100644 --- a/src/com/vaadin/ui/CssLayout.java +++ b/src/com/vaadin/ui/CssLayout.java @@ -240,6 +240,7 @@ public class CssLayout extends AbstractLayout { } } + @SuppressWarnings("unchecked") @Override public void changeVariables(Object source, Map<String, Object> variables) { super.changeVariables(source, variables); diff --git a/src/com/vaadin/ui/Embedded.java b/src/com/vaadin/ui/Embedded.java index f906e696df..2945c84afa 100644 --- a/src/com/vaadin/ui/Embedded.java +++ b/src/com/vaadin/ui/Embedded.java @@ -447,6 +447,7 @@ public class Embedded extends AbstractComponent { removeListener(CLICK_EVENT, ClickEvent.class, listener); } + @SuppressWarnings("unchecked") @Override public void changeVariables(Object source, Map<String, Object> variables) { super.changeVariables(source, variables); diff --git a/src/com/vaadin/ui/Form.java b/src/com/vaadin/ui/Form.java index b6c7e693d6..0e487da603 100644 --- a/src/com/vaadin/ui/Form.java +++ b/src/com/vaadin/ui/Form.java @@ -1052,7 +1052,11 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * Get the field factory of the form. * * @return the FieldFactory Factory used to create the fields. + * @deprecated Use {@link #getFormFieldFactory()} instead. Set the + * FormFieldFactory using + * {@link #setFormFieldFactory(FormFieldFactory)}. */ + @Deprecated public FieldFactory getFieldFactory() { if (fieldFactory instanceof FieldFactory) { return (FieldFactory) fieldFactory; diff --git a/src/com/vaadin/ui/GridLayout.java b/src/com/vaadin/ui/GridLayout.java index b8619e5c76..ae678198f9 100644 --- a/src/com/vaadin/ui/GridLayout.java +++ b/src/com/vaadin/ui/GridLayout.java @@ -1369,6 +1369,7 @@ public class GridLayout extends AbstractLayout implements AlignmentUtils.setComponentAlignment(this, component, alignment); } + @SuppressWarnings("unchecked") @Override public void changeVariables(Object source, Map<String, Object> variables) { super.changeVariables(source, variables); diff --git a/src/com/vaadin/ui/Label.java b/src/com/vaadin/ui/Label.java index 0b37feab95..d1952dc2b3 100644 --- a/src/com/vaadin/ui/Label.java +++ b/src/com/vaadin/ui/Label.java @@ -42,7 +42,7 @@ import com.vaadin.ui.ClientWidget.LoadStyle; @ClientWidget(value = VLabel.class, loadStyle = LoadStyle.EAGER) public class Label extends AbstractComponent implements Property, Property.Viewer, Property.ValueChangeListener, - Property.ValueChangeNotifier, Comparable { + Property.ValueChangeNotifier, Comparable<Object> { /** * Content mode, where the label contains only plain text. The getValue() diff --git a/src/com/vaadin/ui/Panel.java b/src/com/vaadin/ui/Panel.java index 59d81ec9ec..017855a9a0 100644 --- a/src/com/vaadin/ui/Panel.java +++ b/src/com/vaadin/ui/Panel.java @@ -298,6 +298,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, * * @see com.vaadin.terminal.VariableOwner#changeVariables(Object, Map) */ + @SuppressWarnings("unchecked") @Override public void changeVariables(Object source, Map<String, Object> variables) { super.changeVariables(source, variables); diff --git a/src/com/vaadin/ui/Select.java b/src/com/vaadin/ui/Select.java index dbdd1cf0e9..e5c19ccdd3 100644 --- a/src/com/vaadin/ui/Select.java +++ b/src/com/vaadin/ui/Select.java @@ -384,6 +384,7 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering, // (non-visible items can not be deselected) final Collection<?> visible = getVisibleItemIds(); if (visible != null) { + @SuppressWarnings("unchecked") Set<Object> newsel = (Set<Object>) getValue(); if (newsel == null) { newsel = new HashSet<Object>(); diff --git a/src/com/vaadin/ui/SplitPanel.java b/src/com/vaadin/ui/SplitPanel.java index b07010d5dc..197569d1aa 100644 --- a/src/com/vaadin/ui/SplitPanel.java +++ b/src/com/vaadin/ui/SplitPanel.java @@ -390,6 +390,7 @@ public class SplitPanel extends AbstractLayout { * comment here, we use the default documentation from implemented * interface. */ + @SuppressWarnings("unchecked") @Override public void changeVariables(Object source, Map<String, Object> variables) { diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java index b8ebeddc22..9c077bc34e 100644 --- a/src/com/vaadin/ui/Table.java +++ b/src/com/vaadin/ui/Table.java @@ -1875,6 +1875,7 @@ public class Table extends AbstractSelect implements Action.Container, Set<Object> renderedItemIds = getCurrentlyRenderedItemIds(); + @SuppressWarnings("unchecked") HashSet<Object> newValue = new HashSet<Object>( (Collection<Object>) getValue()); diff --git a/tests/src/com/vaadin/tests/dd/DDTest1.java b/tests/src/com/vaadin/tests/dd/DDTest1.java index 7e8cfa3e37..0d709844e9 100644 --- a/tests/src/com/vaadin/tests/dd/DDTest1.java +++ b/tests/src/com/vaadin/tests/dd/DDTest1.java @@ -124,6 +124,7 @@ public class DDTest1 extends TestBase { */ DropHandler itemSorter = new DropHandler() { + @SuppressWarnings("unused") private void populateSubTree(HierarchicalContainer idx, HierarchicalContainer subtree, Object itemId) { Collection<?> children = subtree.getChildren(itemId); @@ -150,6 +151,7 @@ public class DDTest1 extends TestBase { } + @SuppressWarnings("unused") private HierarchicalContainer getSubTree(HierarchicalContainer idx, Object itemId) { HierarchicalContainer hierarchicalContainer = new HierarchicalContainer(); diff --git a/tests/src/com/vaadin/tests/dd/DDTest2.java b/tests/src/com/vaadin/tests/dd/DDTest2.java index 1ed1bf64bc..690b44ff74 100644 --- a/tests/src/com/vaadin/tests/dd/DDTest2.java +++ b/tests/src/com/vaadin/tests/dd/DDTest2.java @@ -127,6 +127,7 @@ public class DDTest2 extends TestBase { final Or fromTree1OrTable = new Or(fromTable, fromTree); // Or could in the case be replaced with, keeping here as an example and // test + @SuppressWarnings("unused") SourceIs treeOrTable = new SourceIs(table, tree1); final And and = new And(fromTree1OrTable, onNode); diff --git a/tests/src/com/vaadin/tests/dd/DDTest6.java b/tests/src/com/vaadin/tests/dd/DDTest6.java index 014438a4e8..8c86b93513 100644 --- a/tests/src/com/vaadin/tests/dd/DDTest6.java +++ b/tests/src/com/vaadin/tests/dd/DDTest6.java @@ -57,8 +57,6 @@ public class DDTest6 extends TestBase { new Folder("Images"), new File("document.doc"), new File("song.mp3"), new File("photo.jpg") }; - private DropHandler dh; - private static Tree tree1; private SplitPanel sp; diff --git a/tests/src/com/vaadin/tests/dd/DDTest7.java b/tests/src/com/vaadin/tests/dd/DDTest7.java index 890db08eb3..8efaff8759 100644 --- a/tests/src/com/vaadin/tests/dd/DDTest7.java +++ b/tests/src/com/vaadin/tests/dd/DDTest7.java @@ -12,7 +12,6 @@ import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; -import com.vaadin.terminal.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.TestUtils; import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails; @@ -177,11 +176,6 @@ public class DDTest7 extends TestBase { } - private final static ThemeResource FOLDER = new ThemeResource( - "../runo/icons/16/folder.png"); - private final static ThemeResource DOC = new ThemeResource( - "../runo/icons/16/document.png"); - @Override protected String getDescription() { return "dd"; diff --git a/tests/src/com/vaadin/tests/dd/DDTest8.java b/tests/src/com/vaadin/tests/dd/DDTest8.java index be51c8cd28..fed889b5c1 100644 --- a/tests/src/com/vaadin/tests/dd/DDTest8.java +++ b/tests/src/com/vaadin/tests/dd/DDTest8.java @@ -49,6 +49,7 @@ public class DDTest8 extends TestBase { */ DropHandler itemSorter = new DropHandler() { + @SuppressWarnings("unused") private void populateSubTree(HierarchicalContainer idx, HierarchicalContainer subtree, Object itemId) { Collection<?> children = subtree.getChildren(itemId); @@ -75,6 +76,7 @@ public class DDTest8 extends TestBase { } + @SuppressWarnings("unused") private HierarchicalContainer getSubTree(HierarchicalContainer idx, Object itemId) { HierarchicalContainer hierarchicalContainer = new HierarchicalContainer(); diff --git a/tests/src/com/vaadin/tests/dd/DragDropPane.java b/tests/src/com/vaadin/tests/dd/DragDropPane.java index ec9015679c..a3552b05b5 100644 --- a/tests/src/com/vaadin/tests/dd/DragDropPane.java +++ b/tests/src/com/vaadin/tests/dd/DragDropPane.java @@ -116,8 +116,8 @@ public class DragDropPane extends DragAndDropWrapper implements DropHandler { WrapperTransferable wtr = (WrapperTransferable) ctr; String object = wtr.getText(); - String html = wtr.getHtml(); - String url = (String) ctr.getData("Url"); + // String html = wtr.getHtml(); + // String url = (String) ctr.getData("Url"); final Label l = new Label(); l.setCaption("Generated from HTML5 drag:"); diff --git a/tests/src/com/vaadin/tests/dd/VMyDragSource.java b/tests/src/com/vaadin/tests/dd/VMyDragSource.java index a5f52522ad..350ee064f3 100644 --- a/tests/src/com/vaadin/tests/dd/VMyDragSource.java +++ b/tests/src/com/vaadin/tests/dd/VMyDragSource.java @@ -24,6 +24,7 @@ public class VMyDragSource extends Composite implements Paintable, private boolean mouseDown; private MouseDownEvent mDownEvent; + @SuppressWarnings("unused") private ApplicationConnection client; public VMyDragSource() { |