Browse Source

Remove dead code

Change-Id: I1ac813afa47e38fb508e676d25d103a29bfada6a
tags/7.2.0.beta1
Johannes Dahlström 10 years ago
parent
commit
8e2085c346
28 changed files with 6 additions and 79 deletions
  1. 0
    1
      buildhelpers/src/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java
  2. 1
    2
      client/src/com/vaadin/client/ApplicationConnection.java
  3. 0
    4
      client/src/com/vaadin/client/Profiler.java
  4. 0
    1
      client/src/com/vaadin/client/ui/VAccordion.java
  5. 0
    11
      client/src/com/vaadin/client/ui/VCalendarPanel.java
  6. 0
    8
      client/src/com/vaadin/client/ui/VLabel.java
  7. 0
    1
      client/src/com/vaadin/client/ui/VPanel.java
  8. 0
    1
      client/src/com/vaadin/client/ui/VScrollTable.java
  9. 0
    2
      client/src/com/vaadin/client/ui/VTabsheet.java
  10. 4
    4
      client/src/com/vaadin/client/ui/calendar/schedule/DateCellDayEvent.java
  11. 0
    2
      client/src/com/vaadin/client/ui/calendar/schedule/DayToolbar.java
  12. 0
    1
      client/src/com/vaadin/client/ui/calendar/schedule/MonthGrid.java
  13. 0
    1
      client/src/com/vaadin/client/ui/calendar/schedule/SimpleDayCell.java
  14. 0
    3
      client/src/com/vaadin/client/ui/dd/VIsOverId.java
  15. 0
    2
      client/src/com/vaadin/client/ui/dd/VItemIdIs.java
  16. 0
    6
      client/src/com/vaadin/client/ui/label/LabelConnector.java
  17. 0
    2
      client/src/com/vaadin/client/ui/ui/UIConnector.java
  18. 0
    6
      server/src/com/vaadin/data/fieldgroup/FieldGroup.java
  19. 0
    2
      server/src/com/vaadin/server/LegacyCommunicationManager.java
  20. 0
    1
      server/src/com/vaadin/server/VaadinPortlet.java
  21. 0
    3
      server/src/com/vaadin/ui/AbstractComponent.java
  22. 0
    2
      server/src/com/vaadin/ui/ComboBox.java
  23. 0
    4
      server/src/com/vaadin/ui/Label.java
  24. 0
    1
      server/src/com/vaadin/ui/Table.java
  25. 1
    1
      server/tests/src/com/vaadin/data/util/TestIndexedContainer.java
  26. 0
    5
      server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java
  27. 0
    1
      server/tests/src/com/vaadin/data/util/sqlcontainer/TicketTests.java
  28. 0
    1
      uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java

+ 0
- 1
buildhelpers/src/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java View File

URLConnection connection = url.openConnection(); URLConnection connection = url.openConnection();
InputStream urlStream = connection.getInputStream(); InputStream urlStream = connection.getInputStream();


@SuppressWarnings("unchecked")
List<String> tickets = IOUtils.readLines(urlStream); List<String> tickets = IOUtils.readLines(urlStream);


for (String ticket : tickets) { for (String ticket : tickets) {

+ 1
- 2
client/src/com/vaadin/client/ApplicationConnection.java View File

import com.google.gwt.user.client.ui.HasWidgets; import com.google.gwt.user.client.ui.HasWidgets;
import com.google.gwt.user.client.ui.Widget; import com.google.gwt.user.client.ui.Widget;
import com.vaadin.client.ApplicationConfiguration.ErrorMessage; import com.vaadin.client.ApplicationConfiguration.ErrorMessage;
import com.vaadin.client.ApplicationConnection.ApplicationStoppedEvent;
import com.vaadin.client.ResourceLoader.ResourceLoadEvent; import com.vaadin.client.ResourceLoader.ResourceLoadEvent;
import com.vaadin.client.ResourceLoader.ResourceLoadListener; import com.vaadin.client.ResourceLoader.ResourceLoadListener;
import com.vaadin.client.communication.HasJavaScriptConnectorHelper; import com.vaadin.client.communication.HasJavaScriptConnectorHelper;
* *
* To listen for the event add a {@link ApplicationStoppedHandler} by * To listen for the event add a {@link ApplicationStoppedHandler} by
* invoking * invoking
* {@link ApplicationConnection#addHandler(ApplicationStoppedEvent.Type, ApplicationStoppedHandler)}
* {@link ApplicationConnection#addHandler(ApplicationConnection.ApplicationStoppedEvent.Type, ApplicationStoppedHandler)}
* to the {@link ApplicationConnection} * to the {@link ApplicationConnection}
* *
* @since 7.1.8 * @since 7.1.8

+ 0
- 4
client/src/com/vaadin/client/Profiler.java View File

if (isEnabled()) { if (isEnabled()) {
double now = Duration.currentTimeMillis(); double now = Duration.currentTimeMillis();


StringBuilder stringBuilder = new StringBuilder(
"Time since window.performance.timing events");
SimpleTree tree = new SimpleTree(stringBuilder.toString());

String[] keys = new String[] { "navigationStart", String[] keys = new String[] { "navigationStart",
"unloadEventStart", "unloadEventEnd", "redirectStart", "unloadEventStart", "unloadEventEnd", "redirectStart",
"redirectEnd", "fetchStart", "domainLookupStart", "redirectEnd", "fetchStart", "domainLookupStart",

+ 0
- 1
client/src/com/vaadin/client/ui/VAccordion.java View File

} }


@Override @Override
@SuppressWarnings("unchecked")
public Iterator<Widget> getWidgetIterator() { public Iterator<Widget> getWidgetIterator() {
return widgets.iterator(); return widgets.iterator();
} }

+ 0
- 11
client/src/com/vaadin/client/ui/VCalendarPanel.java View File



private Resolution resolution = Resolution.YEAR; private Resolution resolution = Resolution.YEAR;


private int focusedRow;

private Timer mouseTimer; private Timer mouseTimer;


private Date value; private Date value;
if (curday.getDate().equals(date)) { if (curday.getDate().equals(date)) {
curday.addStyleDependentName(CN_FOCUSED); curday.addStyleDependentName(CN_FOCUSED);
focusedDay = curday; focusedDay = curday;
focusedRow = i;
return; return;
} }
} }
} }
if (curr.equals(focusedDate)) { if (curr.equals(focusedDate)) {
focusedDay = day; focusedDay = day;
focusedRow = weekOfMonth;
if (hasFocus) { if (hasFocus) {
day.addStyleDependentName(CN_FOCUSED); day.addStyleDependentName(CN_FOCUSED);
} }
* Updates the valus to correspond to the values in value * Updates the valus to correspond to the values in value
*/ */
public void updateTimes() { public void updateTimes() {
boolean selected = true;
if (value == null) { if (value == null) {
value = new Date(); value = new Date();
selected = false;
} }
if (getDateTimeService().isTwelveHourClock()) { if (getDateTimeService().isTwelveHourClock()) {
int h = value.getHours(); int h = value.getHours();


} }


private int getMilliseconds() {
return DateTimeService.getMilliseconds(value);
}

private DateTimeService getDateTimeService() { private DateTimeService getDateTimeService() {
if (dateTimeService == null) { if (dateTimeService == null) {
dateTimeService = new DateTimeService(); dateTimeService = new DateTimeService();
private static final String SUBPART_HOUR_SELECT = "h"; private static final String SUBPART_HOUR_SELECT = "h";
private static final String SUBPART_MINUTE_SELECT = "m"; private static final String SUBPART_MINUTE_SELECT = "m";
private static final String SUBPART_SECS_SELECT = "s"; private static final String SUBPART_SECS_SELECT = "s";
private static final String SUBPART_MSECS_SELECT = "ms";
private static final String SUBPART_AMPM_SELECT = "ampm"; private static final String SUBPART_AMPM_SELECT = "ampm";
private static final String SUBPART_DAY = "day"; private static final String SUBPART_DAY = "day";
private static final String SUBPART_MONTH_YEAR_HEADER = "header"; private static final String SUBPART_MONTH_YEAR_HEADER = "header";

+ 0
- 8
client/src/com/vaadin/client/ui/VLabel.java View File



import com.google.gwt.user.client.Event; import com.google.gwt.user.client.Event;
import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HTML;
import com.vaadin.client.ApplicationConnection;
import com.vaadin.client.BrowserInfo; import com.vaadin.client.BrowserInfo;
import com.vaadin.client.Util; import com.vaadin.client.Util;
import com.vaadin.client.VTooltip; import com.vaadin.client.VTooltip;
public static final String CLASSNAME = "v-label"; public static final String CLASSNAME = "v-label";
private static final String CLASSNAME_UNDEFINED_WIDTH = "v-label-undef-w"; private static final String CLASSNAME_UNDEFINED_WIDTH = "v-label-undef-w";


private ApplicationConnection connection;

public VLabel() { public VLabel() {
super(); super();
setStyleName(CLASSNAME); setStyleName(CLASSNAME);
super.setText(text); super.setText(text);
} }
} }

/** For internal use only. May be removed or replaced in the future. */
public void setConnection(ApplicationConnection client) {
connection = client;
}
} }

+ 0
- 1
client/src/com/vaadin/client/ui/VPanel.java View File

public void onBrowserEvent(Event event) { public void onBrowserEvent(Event event) {
super.onBrowserEvent(event); super.onBrowserEvent(event);


final Element target = DOM.eventGetTarget(event);
final int type = DOM.eventGetType(event); final int type = DOM.eventGetType(event);
if (type == Event.ONKEYDOWN && shortcutHandler != null) { if (type == Event.ONKEYDOWN && shortcutHandler != null) {
shortcutHandler.handleKeyboardEvent(event); shortcutHandler.handleKeyboardEvent(event);

+ 0
- 1
client/src/com/vaadin/client/ui/VScrollTable.java View File

private Element getEventTargetTdOrTr(Event event) { private Element getEventTargetTdOrTr(Event event) {
final Element eventTarget = event.getEventTarget().cast(); final Element eventTarget = event.getEventTarget().cast();
Widget widget = Util.findWidget(eventTarget, null); Widget widget = Util.findWidget(eventTarget, null);
final Element thisTrElement = getElement();


if (widget != this) { if (widget != this) {
/* /*

+ 0
- 2
client/src/com/vaadin/client/ui/VTabsheet.java View File

private boolean closable = false; private boolean closable = false;
private Element closeButton; private Element closeButton;
private Tab tab; private Tab tab;
private ApplicationConnection client;


TabCaption(Tab tab, ApplicationConnection client) { TabCaption(Tab tab, ApplicationConnection client) {
super(client); super(client);
this.client = client;
this.tab = tab; this.tab = tab;


AriaHelper.ensureHasId(getElement()); AriaHelper.ensureHasId(getElement());

+ 4
- 4
client/src/com/vaadin/client/ui/calendar/schedule/DateCellDayEvent.java View File

import com.google.gwt.user.client.Event; import com.google.gwt.user.client.Event;
import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.HorizontalPanel;
import com.vaadin.client.Util; import com.vaadin.client.Util;
import com.vaadin.client.ui.VCalendar;
import com.vaadin.shared.ui.calendar.DateConstants; import com.vaadin.shared.ui.calendar.DateConstants;


/** /**
eventContent.addClassName("v-calendar-event-content"); eventContent.addClassName("v-calendar-event-content");
getElement().appendChild(eventContent); getElement().appendChild(eventContent);


VCalendar calendar = weekGrid.getCalendar();
if (weekGrid.getCalendar().isEventResizeAllowed()) { if (weekGrid.getCalendar().isEventResizeAllowed()) {
topResizeBar = DOM.createDiv(); topResizeBar = DOM.createDiv();
bottomResizeBar = DOM.createDiv(); bottomResizeBar = DOM.createDiv();
String escapedCaption = Util.escapeHTML(calendarEvent.getCaption()); String escapedCaption = Util.escapeHTML(calendarEvent.getCaption());
String timeAsText = calendarEvent.getTimeAsText(); String timeAsText = calendarEvent.getTimeAsText();
if (bigMode) { if (bigMode) {
innerHtml = "<span>" + timeAsText + "</span><br />" + escapedCaption;
innerHtml = "<span>" + timeAsText + "</span><br />"
+ escapedCaption;
} else { } else {
innerHtml = "<span>" + timeAsText + "<span>:</span></span> " + escapedCaption;
innerHtml = "<span>" + timeAsText + "<span>:</span></span> "
+ escapedCaption;
} }
caption.setInnerHTML(innerHtml); caption.setInnerHTML(innerHtml);
eventContent.setInnerHTML(""); eventContent.setInnerHTML("");

+ 0
- 2
client/src/com/vaadin/client/ui/calendar/schedule/DayToolbar.java View File

setCellWidth(nextLabel, MARGINRIGHT + "px"); setCellWidth(nextLabel, MARGINRIGHT + "px");
setCellHorizontalAlignment(nextLabel, ALIGN_RIGHT); setCellHorizontalAlignment(nextLabel, ALIGN_RIGHT);
int cellw = width / (count - 2); int cellw = width / (count - 2);
int remain = width % (count - 2);
int cellw2 = cellw + 1;
if (cellw > 0) { if (cellw > 0) {
int[] cellWidths = VCalendar int[] cellWidths = VCalendar
.distributeSize(width, count - 2, 0); .distributeSize(width, count - 2, 0);

+ 0
- 1
client/src/com/vaadin/client/ui/calendar/schedule/MonthGrid.java View File

private SimpleDayCell selectionEnd; private SimpleDayCell selectionEnd;
private final VCalendar calendar; private final VCalendar calendar;
private boolean rangeSelectDisabled; private boolean rangeSelectDisabled;
private boolean disabled;
private boolean enabled = true; private boolean enabled = true;
private final HandlerRegistration keyDownHandler; private final HandlerRegistration keyDownHandler;



+ 0
- 1
client/src/com/vaadin/client/ui/calendar/schedule/SimpleDayCell.java View File

private Widget clickedWidget; private Widget clickedWidget;
private HandlerRegistration bottomSpacerMouseDownHandler; private HandlerRegistration bottomSpacerMouseDownHandler;
private boolean scrollable = false; private boolean scrollable = false;
private boolean eventCanceled;
private MonthGrid monthGrid; private MonthGrid monthGrid;
private HandlerRegistration keyDownHandler; private HandlerRegistration keyDownHandler;



+ 0
- 3
client/src/com/vaadin/client/ui/dd/VIsOverId.java View File

package com.vaadin.client.ui.dd; package com.vaadin.client.ui.dd;


import com.vaadin.client.ComponentConnector; import com.vaadin.client.ComponentConnector;
import com.vaadin.client.ConnectorMap;
import com.vaadin.client.UIDL; import com.vaadin.client.UIDL;
import com.vaadin.shared.ui.dd.AcceptCriterion; import com.vaadin.shared.ui.dd.AcceptCriterion;
import com.vaadin.ui.AbstractSelect; import com.vaadin.ui.AbstractSelect;
.getCurrentDropHandler(); .getCurrentDropHandler();
ComponentConnector dropHandlerConnector = currentDropHandler ComponentConnector dropHandlerConnector = currentDropHandler
.getConnector(); .getConnector();
ConnectorMap paintableMap = ConnectorMap.get(currentDropHandler
.getApplicationConnection());


String pid2 = dropHandlerConnector.getConnectorId(); String pid2 = dropHandlerConnector.getConnectorId();
if (pid2.equals(pid)) { if (pid2.equals(pid)) {

+ 0
- 2
client/src/com/vaadin/client/ui/dd/VItemIdIs.java View File

String pid = configuration.getStringAttribute("s"); String pid = configuration.getStringAttribute("s");
ComponentConnector dragSource = drag.getTransferable() ComponentConnector dragSource = drag.getTransferable()
.getDragSource(); .getDragSource();
VDropHandler currentDropHandler = VDragAndDropManager.get()
.getCurrentDropHandler();
String pid2 = dragSource.getConnectorId(); String pid2 = dragSource.getConnectorId();
if (pid2.equals(pid)) { if (pid2.equals(pid)) {
Object searchedId = drag.getTransferable().getData("itemId"); Object searchedId = drag.getTransferable().getData("itemId");

+ 0
- 6
client/src/com/vaadin/client/ui/label/LabelConnector.java View File

return (LabelState) super.getState(); return (LabelState) super.getState();
} }


@Override
protected void init() {
super.init();
getWidget().setConnection(getConnection());
}

@Override @Override
public void onStateChanged(StateChangeEvent stateChangeEvent) { public void onStateChanged(StateChangeEvent stateChangeEvent) {
super.onStateChanged(stateChangeEvent); super.onStateChanged(stateChangeEvent);

+ 0
- 2
client/src/com/vaadin/client/ui/ui/UIConnector.java View File

import com.vaadin.client.BrowserInfo; import com.vaadin.client.BrowserInfo;
import com.vaadin.client.ComponentConnector; import com.vaadin.client.ComponentConnector;
import com.vaadin.client.ConnectorHierarchyChangeEvent; import com.vaadin.client.ConnectorHierarchyChangeEvent;
import com.vaadin.client.ConnectorMap;
import com.vaadin.client.Focusable; import com.vaadin.client.Focusable;
import com.vaadin.client.Paintable; import com.vaadin.client.Paintable;
import com.vaadin.client.ServerConnector; import com.vaadin.client.ServerConnector;


@Override @Override
public void updateFromUIDL(final UIDL uidl, ApplicationConnection client) { public void updateFromUIDL(final UIDL uidl, ApplicationConnection client) {
ConnectorMap paintableMap = ConnectorMap.get(getConnection());
getWidget().id = getConnectorId(); getWidget().id = getConnectorId();
boolean firstPaint = getWidget().connection == null; boolean firstPaint = getWidget().connection == null;
getWidget().connection = client; getWidget().connection = client;

+ 0
- 6
server/src/com/vaadin/data/fieldgroup/FieldGroup.java View File

import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.logging.Logger;


import com.vaadin.data.Item; import com.vaadin.data.Item;
import com.vaadin.data.Property; import com.vaadin.data.Property;
*/ */
public class FieldGroup implements Serializable { public class FieldGroup implements Serializable {


private static final Logger logger = Logger.getLogger(FieldGroup.class
.getName());

private Item itemDataSource; private Item itemDataSource;
private boolean buffered = true; private boolean buffered = true;


*/ */
public Field<?> buildAndBind(String caption, Object propertyId) public Field<?> buildAndBind(String caption, Object propertyId)
throws BindException { throws BindException {
Class<?> type = getPropertyType(propertyId);
return buildAndBind(caption, propertyId, Field.class); return buildAndBind(caption, propertyId, Field.class);

} }


/** /**

+ 0
- 2
server/src/com/vaadin/server/LegacyCommunicationManager.java View File

private final HashMap<Class<? extends ClientConnector>, Integer> typeToKey = new HashMap<Class<? extends ClientConnector>, Integer>(); private final HashMap<Class<? extends ClientConnector>, Integer> typeToKey = new HashMap<Class<? extends ClientConnector>, Integer>();
private int nextTypeKey = 0; private int nextTypeKey = 0;


private BootstrapHandler bootstrapHandler;

/** /**
* @deprecated As of 7.1. Will be removed in the future. * @deprecated As of 7.1. Will be removed in the future.
*/ */

+ 0
- 1
server/src/com/vaadin/server/VaadinPortlet.java View File

if (request instanceof RenderRequest) { if (request instanceof RenderRequest) {
return RequestType.RENDER; return RequestType.RENDER;
} else if (request instanceof ResourceRequest) { } else if (request instanceof ResourceRequest) {
ResourceRequest resourceRequest = (ResourceRequest) request;
if (ServletPortletHelper.isUIDLRequest(vaadinRequest)) { if (ServletPortletHelper.isUIDLRequest(vaadinRequest)) {
return RequestType.UIDL; return RequestType.UIDL;
} else if (PortletUIInitHandler.isUIInitRequest(vaadinRequest)) { } else if (PortletUIInitHandler.isUIInitRequest(vaadinRequest)) {

+ 0
- 3
server/src/com/vaadin/ui/AbstractComponent.java View File

import com.vaadin.event.ShortcutListener; import com.vaadin.event.ShortcutListener;
import com.vaadin.server.AbstractClientConnector; import com.vaadin.server.AbstractClientConnector;
import com.vaadin.server.ComponentSizeValidator; import com.vaadin.server.ComponentSizeValidator;
import com.vaadin.server.ErrorHandler;
import com.vaadin.server.ErrorMessage; import com.vaadin.server.ErrorMessage;
import com.vaadin.server.Resource; import com.vaadin.server.Resource;
import com.vaadin.server.VaadinSession; import com.vaadin.server.VaadinSession;
private static final Pattern sizePattern = Pattern private static final Pattern sizePattern = Pattern
.compile("^(-?\\d+(\\.\\d+)?)(%|px|em|rem|ex|in|cm|mm|pt|pc)?$"); .compile("^(-?\\d+(\\.\\d+)?)(%|px|em|rem|ex|in|cm|mm|pt|pc)?$");


private ErrorHandler errorHandler = null;

/** /**
* Keeps track of the Actions added to this component; the actual * Keeps track of the Actions added to this component; the actual
* handling/notifying is delegated, usually to the containing window. * handling/notifying is delegated, usually to the containing window.

+ 0
- 2
server/src/com/vaadin/ui/ComboBox.java View File

*/ */
protected int pageLength = 10; protected int pageLength = 10;


private int columns = 0;

// Current page when the user is 'paging' trough options // Current page when the user is 'paging' trough options
private int currentPage = -1; private int currentPage = -1;



+ 0
- 4
server/src/com/vaadin/ui/Label.java View File



import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Locale; import java.util.Locale;
import java.util.logging.Logger;


import com.vaadin.data.Property; import com.vaadin.data.Property;
import com.vaadin.data.util.AbstractProperty; import com.vaadin.data.util.AbstractProperty;
Property.Viewer, Property.ValueChangeListener, Property.Viewer, Property.ValueChangeListener,
Property.ValueChangeNotifier, Comparable<Label> { Property.ValueChangeNotifier, Comparable<Label> {


private static final Logger logger = Logger
.getLogger(Label.class.getName());

/** /**
* @deprecated As of 7.0, use {@link ContentMode#TEXT} instead * @deprecated As of 7.0, use {@link ContentMode#TEXT} instead
*/ */

+ 0
- 1
server/src/com/vaadin/ui/Table.java View File

// more efficient implementation for containers supporting access by // more efficient implementation for containers supporting access by
// index // index


Container.Indexed indexed = ((Container.Indexed) items);
List<?> itemIds = getItemIds(firstIndex, rows); List<?> itemIds = getItemIds(firstIndex, rows);
for (int i = 0; i < rows && i < itemIds.size(); i++) { for (int i = 0; i < rows && i < itemIds.size(); i++) {
Object id = itemIds.get(i); Object id = itemIds.get(i);

+ 1
- 1
server/tests/src/com/vaadin/data/util/TestIndexedContainer.java View File

Capture<ItemAddEvent> capturedEvent = captureAddEvent(addListener); Capture<ItemAddEvent> capturedEvent = captureAddEvent(addListener);
EasyMock.replay(addListener); EasyMock.replay(addListener);


Object itemId = container.addItemAt(1);
container.addItemAt(1);


assertEquals(1, capturedEvent.getValue().getFirstIndex()); assertEquals(1, capturedEvent.getValue().getFirstIndex());
} }

+ 0
- 5
server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java View File

EasyMock.expect(delegate.getCountStatement()) EasyMock.expect(delegate.getCountStatement())
.andAnswer(new IAnswer<StatementHelper>() { .andAnswer(new IAnswer<StatementHelper>() {
@Override @Override
@SuppressWarnings("deprecation")
public StatementHelper answer() throws Throwable { public StatementHelper answer() throws Throwable {
StatementHelper sh = new StatementHelper(); StatementHelper sh = new StatementHelper();
StringBuffer query = new StringBuffer( StringBuffer query = new StringBuffer(
EasyMock.expect(delegate.getCountStatement()) EasyMock.expect(delegate.getCountStatement())
.andAnswer(new IAnswer<StatementHelper>() { .andAnswer(new IAnswer<StatementHelper>() {
@Override @Override
@SuppressWarnings("deprecation")
public StatementHelper answer() throws Throwable { public StatementHelper answer() throws Throwable {
StatementHelper sh = new StatementHelper(); StatementHelper sh = new StatementHelper();
StringBuffer query = new StringBuffer( StringBuffer query = new StringBuffer(
EasyMock.expect(delegate.getCountStatement()) EasyMock.expect(delegate.getCountStatement())
.andAnswer(new IAnswer<StatementHelper>() { .andAnswer(new IAnswer<StatementHelper>() {
@Override @Override
@SuppressWarnings("deprecation")
public StatementHelper answer() throws Throwable { public StatementHelper answer() throws Throwable {
StatementHelper sh = new StatementHelper(); StatementHelper sh = new StatementHelper();
StringBuffer query = new StringBuffer( StringBuffer query = new StringBuffer(
EasyMock.expect(delegate.getCountStatement()) EasyMock.expect(delegate.getCountStatement())
.andAnswer(new IAnswer<StatementHelper>() { .andAnswer(new IAnswer<StatementHelper>() {
@Override @Override
@SuppressWarnings("deprecation")
public StatementHelper answer() throws Throwable { public StatementHelper answer() throws Throwable {
StatementHelper sh = new StatementHelper(); StatementHelper sh = new StatementHelper();
StringBuffer query = new StringBuffer( StringBuffer query = new StringBuffer(
EasyMock.expect(delegate.getCountStatement()) EasyMock.expect(delegate.getCountStatement())
.andAnswer(new IAnswer<StatementHelper>() { .andAnswer(new IAnswer<StatementHelper>() {
@Override @Override
@SuppressWarnings("deprecation")
public StatementHelper answer() throws Throwable { public StatementHelper answer() throws Throwable {
StatementHelper sh = new StatementHelper(); StatementHelper sh = new StatementHelper();
StringBuffer query = new StringBuffer( StringBuffer query = new StringBuffer(

+ 0
- 1
server/tests/src/com/vaadin/data/util/sqlcontainer/TicketTests.java View File

EasyMock.expect(delegate.getCountStatement()) EasyMock.expect(delegate.getCountStatement())
.andAnswer(new IAnswer<StatementHelper>() { .andAnswer(new IAnswer<StatementHelper>() {
@Override @Override
@SuppressWarnings("deprecation")
public StatementHelper answer() throws Throwable { public StatementHelper answer() throws Throwable {
StatementHelper sh = new StatementHelper(); StatementHelper sh = new StatementHelper();
StringBuffer query = new StringBuffer( StringBuffer query = new StringBuffer(

+ 0
- 1
uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java View File

Socket accept = serverSocket.accept(); Socket accept = serverSocket.accept();
// First stop listening to the port // First stop listening to the port
serverSocket.close(); serverSocket.close();
final Thread stopThread = Thread.currentThread();


// Start a thread that kills the JVM if // Start a thread that kills the JVM if
// server.stop() doesn't have any effect // server.stop() doesn't have any effect

Loading…
Cancel
Save