Change-Id: I1ac813afa47e38fb508e676d25d103a29bfada6atags/7.2.0.beta1
@@ -37,7 +37,6 @@ public class FetchReleaseNotesTickets { | |||
URLConnection connection = url.openConnection(); | |||
InputStream urlStream = connection.getInputStream(); | |||
@SuppressWarnings("unchecked") | |||
List<String> tickets = IOUtils.readLines(urlStream); | |||
for (String ticket : tickets) { |
@@ -65,7 +65,6 @@ import com.google.gwt.user.client.Window.ClosingHandler; | |||
import com.google.gwt.user.client.ui.HasWidgets; | |||
import com.google.gwt.user.client.ui.Widget; | |||
import com.vaadin.client.ApplicationConfiguration.ErrorMessage; | |||
import com.vaadin.client.ApplicationConnection.ApplicationStoppedEvent; | |||
import com.vaadin.client.ResourceLoader.ResourceLoadEvent; | |||
import com.vaadin.client.ResourceLoader.ResourceLoadListener; | |||
import com.vaadin.client.communication.HasJavaScriptConnectorHelper; | |||
@@ -363,7 +362,7 @@ public class ApplicationConnection { | |||
* | |||
* To listen for the event add a {@link ApplicationStoppedHandler} by | |||
* invoking | |||
* {@link ApplicationConnection#addHandler(ApplicationStoppedEvent.Type, ApplicationStoppedHandler)} | |||
* {@link ApplicationConnection#addHandler(ApplicationConnection.ApplicationStoppedEvent.Type, ApplicationStoppedHandler)} | |||
* to the {@link ApplicationConnection} | |||
* | |||
* @since 7.1.8 |
@@ -297,10 +297,6 @@ public class Profiler { | |||
if (isEnabled()) { | |||
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", | |||
"unloadEventStart", "unloadEventEnd", "redirectStart", | |||
"redirectEnd", "fetchStart", "domainLookupStart", |
@@ -463,7 +463,6 @@ public class VAccordion extends VTabsheetBase { | |||
} | |||
@Override | |||
@SuppressWarnings("unchecked") | |||
public Iterator<Widget> getWidgetIterator() { | |||
return widgets.iterator(); | |||
} |
@@ -170,8 +170,6 @@ public class VCalendarPanel extends FocusableFlexTable implements | |||
private Resolution resolution = Resolution.YEAR; | |||
private int focusedRow; | |||
private Timer mouseTimer; | |||
private Date value; | |||
@@ -256,7 +254,6 @@ public class VCalendarPanel extends FocusableFlexTable implements | |||
if (curday.getDate().equals(date)) { | |||
curday.addStyleDependentName(CN_FOCUSED); | |||
focusedDay = curday; | |||
focusedRow = i; | |||
return; | |||
} | |||
} | |||
@@ -741,7 +738,6 @@ public class VCalendarPanel extends FocusableFlexTable implements | |||
} | |||
if (curr.equals(focusedDate)) { | |||
focusedDay = day; | |||
focusedRow = weekOfMonth; | |||
if (hasFocus) { | |||
day.addStyleDependentName(CN_FOCUSED); | |||
} | |||
@@ -1795,10 +1791,8 @@ public class VCalendarPanel extends FocusableFlexTable implements | |||
* Updates the valus to correspond to the values in value | |||
*/ | |||
public void updateTimes() { | |||
boolean selected = true; | |||
if (value == null) { | |||
value = new Date(); | |||
selected = false; | |||
} | |||
if (getDateTimeService().isTwelveHourClock()) { | |||
int h = value.getHours(); | |||
@@ -1833,10 +1827,6 @@ public class VCalendarPanel extends FocusableFlexTable implements | |||
} | |||
private int getMilliseconds() { | |||
return DateTimeService.getMilliseconds(value); | |||
} | |||
private DateTimeService getDateTimeService() { | |||
if (dateTimeService == null) { | |||
dateTimeService = new DateTimeService(); | |||
@@ -2034,7 +2024,6 @@ public class VCalendarPanel extends FocusableFlexTable implements | |||
private static final String SUBPART_HOUR_SELECT = "h"; | |||
private static final String SUBPART_MINUTE_SELECT = "m"; | |||
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_DAY = "day"; | |||
private static final String SUBPART_MONTH_YEAR_HEADER = "header"; |
@@ -18,7 +18,6 @@ package com.vaadin.client.ui; | |||
import com.google.gwt.user.client.Event; | |||
import com.google.gwt.user.client.ui.HTML; | |||
import com.vaadin.client.ApplicationConnection; | |||
import com.vaadin.client.BrowserInfo; | |||
import com.vaadin.client.Util; | |||
import com.vaadin.client.VTooltip; | |||
@@ -28,8 +27,6 @@ public class VLabel extends HTML { | |||
public static final String CLASSNAME = "v-label"; | |||
private static final String CLASSNAME_UNDEFINED_WIDTH = "v-label-undef-w"; | |||
private ApplicationConnection connection; | |||
public VLabel() { | |||
super(); | |||
setStyleName(CLASSNAME); | |||
@@ -71,9 +68,4 @@ public class VLabel extends HTML { | |||
super.setText(text); | |||
} | |||
} | |||
/** For internal use only. May be removed or replaced in the future. */ | |||
public void setConnection(ApplicationConnection client) { | |||
connection = client; | |||
} | |||
} |
@@ -170,7 +170,6 @@ public class VPanel extends SimplePanel implements ShortcutActionHandlerOwner, | |||
public void onBrowserEvent(Event event) { | |||
super.onBrowserEvent(event); | |||
final Element target = DOM.eventGetTarget(event); | |||
final int type = DOM.eventGetType(event); | |||
if (type == Event.ONKEYDOWN && shortcutHandler != null) { | |||
shortcutHandler.handleKeyboardEvent(event); |
@@ -6037,7 +6037,6 @@ public class VScrollTable extends FlowPanel implements HasWidgets, | |||
private Element getEventTargetTdOrTr(Event event) { | |||
final Element eventTarget = event.getEventTarget().cast(); | |||
Widget widget = Util.findWidget(eventTarget, null); | |||
final Element thisTrElement = getElement(); | |||
if (widget != this) { | |||
/* |
@@ -313,11 +313,9 @@ public class VTabsheet extends VTabsheetBase implements Focusable, | |||
private boolean closable = false; | |||
private Element closeButton; | |||
private Tab tab; | |||
private ApplicationConnection client; | |||
TabCaption(Tab tab, ApplicationConnection client) { | |||
super(client); | |||
this.client = client; | |||
this.tab = tab; | |||
AriaHelper.ensureHasId(getElement()); |
@@ -42,7 +42,6 @@ import com.google.gwt.user.client.DOM; | |||
import com.google.gwt.user.client.Event; | |||
import com.google.gwt.user.client.ui.HorizontalPanel; | |||
import com.vaadin.client.Util; | |||
import com.vaadin.client.ui.VCalendar; | |||
import com.vaadin.shared.ui.calendar.DateConstants; | |||
/** | |||
@@ -105,7 +104,6 @@ public class DateCellDayEvent extends FocusableHTML implements | |||
eventContent.addClassName("v-calendar-event-content"); | |||
getElement().appendChild(eventContent); | |||
VCalendar calendar = weekGrid.getCalendar(); | |||
if (weekGrid.getCalendar().isEventResizeAllowed()) { | |||
topResizeBar = DOM.createDiv(); | |||
bottomResizeBar = DOM.createDiv(); | |||
@@ -189,9 +187,11 @@ public class DateCellDayEvent extends FocusableHTML implements | |||
String escapedCaption = Util.escapeHTML(calendarEvent.getCaption()); | |||
String timeAsText = calendarEvent.getTimeAsText(); | |||
if (bigMode) { | |||
innerHtml = "<span>" + timeAsText + "</span><br />" + escapedCaption; | |||
innerHtml = "<span>" + timeAsText + "</span><br />" | |||
+ escapedCaption; | |||
} else { | |||
innerHtml = "<span>" + timeAsText + "<span>:</span></span> " + escapedCaption; | |||
innerHtml = "<span>" + timeAsText + "<span>:</span></span> " | |||
+ escapedCaption; | |||
} | |||
caption.setInnerHTML(innerHtml); | |||
eventContent.setInnerHTML(""); |
@@ -72,8 +72,6 @@ public class DayToolbar extends HorizontalPanel implements ClickHandler { | |||
setCellWidth(nextLabel, MARGINRIGHT + "px"); | |||
setCellHorizontalAlignment(nextLabel, ALIGN_RIGHT); | |||
int cellw = width / (count - 2); | |||
int remain = width % (count - 2); | |||
int cellw2 = cellw + 1; | |||
if (cellw > 0) { | |||
int[] cellWidths = VCalendar | |||
.distributeSize(width, count - 2, 0); |
@@ -35,7 +35,6 @@ public class MonthGrid extends FocusableGrid implements KeyDownHandler { | |||
private SimpleDayCell selectionEnd; | |||
private final VCalendar calendar; | |||
private boolean rangeSelectDisabled; | |||
private boolean disabled; | |||
private boolean enabled = true; | |||
private final HandlerRegistration keyDownHandler; | |||
@@ -83,7 +83,6 @@ public class SimpleDayCell extends FocusableFlowPanel implements | |||
private Widget clickedWidget; | |||
private HandlerRegistration bottomSpacerMouseDownHandler; | |||
private boolean scrollable = false; | |||
private boolean eventCanceled; | |||
private MonthGrid monthGrid; | |||
private HandlerRegistration keyDownHandler; | |||
@@ -19,7 +19,6 @@ | |||
package com.vaadin.client.ui.dd; | |||
import com.vaadin.client.ComponentConnector; | |||
import com.vaadin.client.ConnectorMap; | |||
import com.vaadin.client.UIDL; | |||
import com.vaadin.shared.ui.dd.AcceptCriterion; | |||
import com.vaadin.ui.AbstractSelect; | |||
@@ -36,8 +35,6 @@ final public class VIsOverId extends VAcceptCriterion { | |||
.getCurrentDropHandler(); | |||
ComponentConnector dropHandlerConnector = currentDropHandler | |||
.getConnector(); | |||
ConnectorMap paintableMap = ConnectorMap.get(currentDropHandler | |||
.getApplicationConnection()); | |||
String pid2 = dropHandlerConnector.getConnectorId(); | |||
if (pid2.equals(pid)) { |
@@ -32,8 +32,6 @@ final public class VItemIdIs extends VAcceptCriterion { | |||
String pid = configuration.getStringAttribute("s"); | |||
ComponentConnector dragSource = drag.getTransferable() | |||
.getDragSource(); | |||
VDropHandler currentDropHandler = VDragAndDropManager.get() | |||
.getCurrentDropHandler(); | |||
String pid2 = dragSource.getConnectorId(); | |||
if (pid2.equals(pid)) { | |||
Object searchedId = drag.getTransferable().getData("itemId"); |
@@ -35,12 +35,6 @@ public class LabelConnector extends AbstractComponentConnector { | |||
return (LabelState) super.getState(); | |||
} | |||
@Override | |||
protected void init() { | |||
super.init(); | |||
getWidget().setConnection(getConnection()); | |||
} | |||
@Override | |||
public void onStateChanged(StateChangeEvent stateChangeEvent) { | |||
super.onStateChanged(stateChangeEvent); |
@@ -49,7 +49,6 @@ import com.vaadin.client.ApplicationConnection.ApplicationStoppedEvent; | |||
import com.vaadin.client.BrowserInfo; | |||
import com.vaadin.client.ComponentConnector; | |||
import com.vaadin.client.ConnectorHierarchyChangeEvent; | |||
import com.vaadin.client.ConnectorMap; | |||
import com.vaadin.client.Focusable; | |||
import com.vaadin.client.Paintable; | |||
import com.vaadin.client.ServerConnector; | |||
@@ -192,7 +191,6 @@ public class UIConnector extends AbstractSingleComponentContainerConnector | |||
@Override | |||
public void updateFromUIDL(final UIDL uidl, ApplicationConnection client) { | |||
ConnectorMap paintableMap = ConnectorMap.get(getConnection()); | |||
getWidget().id = getConnectorId(); | |||
boolean firstPaint = getWidget().connection == null; | |||
getWidget().connection = client; |
@@ -23,7 +23,6 @@ import java.util.Collections; | |||
import java.util.HashMap; | |||
import java.util.LinkedHashMap; | |||
import java.util.List; | |||
import java.util.logging.Logger; | |||
import com.vaadin.data.Item; | |||
import com.vaadin.data.Property; | |||
@@ -55,9 +54,6 @@ import com.vaadin.util.ReflectTools; | |||
*/ | |||
public class FieldGroup implements Serializable { | |||
private static final Logger logger = Logger.getLogger(FieldGroup.class | |||
.getName()); | |||
private Item itemDataSource; | |||
private boolean buffered = true; | |||
@@ -1013,9 +1009,7 @@ public class FieldGroup implements Serializable { | |||
*/ | |||
public Field<?> buildAndBind(String caption, Object propertyId) | |||
throws BindException { | |||
Class<?> type = getPropertyType(propertyId); | |||
return buildAndBind(caption, propertyId, Field.class); | |||
} | |||
/** |
@@ -316,8 +316,6 @@ public class LegacyCommunicationManager implements Serializable { | |||
private final HashMap<Class<? extends ClientConnector>, Integer> typeToKey = new HashMap<Class<? extends ClientConnector>, Integer>(); | |||
private int nextTypeKey = 0; | |||
private BootstrapHandler bootstrapHandler; | |||
/** | |||
* @deprecated As of 7.1. Will be removed in the future. | |||
*/ |
@@ -365,7 +365,6 @@ public class VaadinPortlet extends GenericPortlet implements Constants, | |||
if (request instanceof RenderRequest) { | |||
return RequestType.RENDER; | |||
} else if (request instanceof ResourceRequest) { | |||
ResourceRequest resourceRequest = (ResourceRequest) request; | |||
if (ServletPortletHelper.isUIDLRequest(vaadinRequest)) { | |||
return RequestType.UIDL; | |||
} else if (PortletUIInitHandler.isUIInitRequest(vaadinRequest)) { |
@@ -31,7 +31,6 @@ import com.vaadin.event.ConnectorActionManager; | |||
import com.vaadin.event.ShortcutListener; | |||
import com.vaadin.server.AbstractClientConnector; | |||
import com.vaadin.server.ComponentSizeValidator; | |||
import com.vaadin.server.ErrorHandler; | |||
import com.vaadin.server.ErrorMessage; | |||
import com.vaadin.server.Resource; | |||
import com.vaadin.server.VaadinSession; | |||
@@ -86,8 +85,6 @@ public abstract class AbstractComponent extends AbstractClientConnector | |||
private static final Pattern sizePattern = Pattern | |||
.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 | |||
* handling/notifying is delegated, usually to the containing window. |
@@ -56,8 +56,6 @@ public class ComboBox extends AbstractSelect implements | |||
*/ | |||
protected int pageLength = 10; | |||
private int columns = 0; | |||
// Current page when the user is 'paging' trough options | |||
private int currentPage = -1; | |||
@@ -18,7 +18,6 @@ package com.vaadin.ui; | |||
import java.lang.reflect.Method; | |||
import java.util.Locale; | |||
import java.util.logging.Logger; | |||
import com.vaadin.data.Property; | |||
import com.vaadin.data.util.AbstractProperty; | |||
@@ -56,9 +55,6 @@ public class Label extends AbstractComponent implements Property<String>, | |||
Property.Viewer, Property.ValueChangeListener, | |||
Property.ValueChangeNotifier, Comparable<Label> { | |||
private static final Logger logger = Logger | |||
.getLogger(Label.class.getName()); | |||
/** | |||
* @deprecated As of 7.0, use {@link ContentMode#TEXT} instead | |||
*/ |
@@ -2165,7 +2165,6 @@ public class Table extends AbstractSelect implements Action.Container, | |||
// more efficient implementation for containers supporting access by | |||
// index | |||
Container.Indexed indexed = ((Container.Indexed) items); | |||
List<?> itemIds = getItemIds(firstIndex, rows); | |||
for (int i = 0; i < rows && i < itemIds.size(); i++) { | |||
Object id = itemIds.get(i); |
@@ -306,7 +306,7 @@ public class TestIndexedContainer extends AbstractInMemoryContainerTest { | |||
Capture<ItemAddEvent> capturedEvent = captureAddEvent(addListener); | |||
EasyMock.replay(addListener); | |||
Object itemId = container.addItemAt(1); | |||
container.addItemAt(1); | |||
assertEquals(1, capturedEvent.getValue().getFirstIndex()); | |||
} |
@@ -1917,7 +1917,6 @@ public class SQLContainerTest { | |||
EasyMock.expect(delegate.getCountStatement()) | |||
.andAnswer(new IAnswer<StatementHelper>() { | |||
@Override | |||
@SuppressWarnings("deprecation") | |||
public StatementHelper answer() throws Throwable { | |||
StatementHelper sh = new StatementHelper(); | |||
StringBuffer query = new StringBuffer( | |||
@@ -1990,7 +1989,6 @@ public class SQLContainerTest { | |||
EasyMock.expect(delegate.getCountStatement()) | |||
.andAnswer(new IAnswer<StatementHelper>() { | |||
@Override | |||
@SuppressWarnings("deprecation") | |||
public StatementHelper answer() throws Throwable { | |||
StatementHelper sh = new StatementHelper(); | |||
StringBuffer query = new StringBuffer( | |||
@@ -2134,7 +2132,6 @@ public class SQLContainerTest { | |||
EasyMock.expect(delegate.getCountStatement()) | |||
.andAnswer(new IAnswer<StatementHelper>() { | |||
@Override | |||
@SuppressWarnings("deprecation") | |||
public StatementHelper answer() throws Throwable { | |||
StatementHelper sh = new StatementHelper(); | |||
StringBuffer query = new StringBuffer( | |||
@@ -2213,7 +2210,6 @@ public class SQLContainerTest { | |||
EasyMock.expect(delegate.getCountStatement()) | |||
.andAnswer(new IAnswer<StatementHelper>() { | |||
@Override | |||
@SuppressWarnings("deprecation") | |||
public StatementHelper answer() throws Throwable { | |||
StatementHelper sh = new StatementHelper(); | |||
StringBuffer query = new StringBuffer( | |||
@@ -2292,7 +2288,6 @@ public class SQLContainerTest { | |||
EasyMock.expect(delegate.getCountStatement()) | |||
.andAnswer(new IAnswer<StatementHelper>() { | |||
@Override | |||
@SuppressWarnings("deprecation") | |||
public StatementHelper answer() throws Throwable { | |||
StatementHelper sh = new StatementHelper(); | |||
StringBuffer query = new StringBuffer( |
@@ -88,7 +88,6 @@ public class TicketTests { | |||
EasyMock.expect(delegate.getCountStatement()) | |||
.andAnswer(new IAnswer<StatementHelper>() { | |||
@Override | |||
@SuppressWarnings("deprecation") | |||
public StatementHelper answer() throws Throwable { | |||
StatementHelper sh = new StatementHelper(); | |||
StringBuffer query = new StringBuffer( |
@@ -217,7 +217,6 @@ public class DevelopmentServerLauncher { | |||
Socket accept = serverSocket.accept(); | |||
// First stop listening to the port | |||
serverSocket.close(); | |||
final Thread stopThread = Thread.currentThread(); | |||
// Start a thread that kills the JVM if | |||
// server.stop() doesn't have any effect |