Update ErrorIndicator test from TB2 to TB4

Change-Id: Ia5755dd476411d51415afb9bbd20ade91e3a23f4

Resize PopupView's overlay on content resize (#13666)

Change-Id: Iad410f26ed7f20bb03f15c46673f6f18081261d9

Fix table focusing when scrolled from the server (#10522)

Change-Id: Ib18a60ae7e41af8c6c119e5b2e12e4fd5bf1069c

Actually close push connection in disconnect() (#13716)

Change-Id: I342633f1caa5746472d29bbb7b71590674adc04c

Fix improper merge of 3d0ff32b from 7.1 to master (#13620)

Correctly call PushConnection.disconnect instead of setting to null.
Also remove the obsolete PushHandler.disconnectCallback.

Change-Id: Ied055d489a269b016318947cd89cf0b46003c596

Convert the ComboBoxClosePopupRetainText test to TB4 to avoid false failures.

Change-Id: Ib36917246fce3f051b61a979289c9bce23b1bf82

Convert the AccordionClipsContent test to TB4 to avoid false failures.

Change-Id: Iced9219e8cd3172c53af286c4b644b04f00041c2

Update Atmosphere client. (#13727)

Change-Id: Ib1ccbaad3aca39c3cbc43d0f4ccace67cf19c435

Fix occasionally misplaced error indicators in Buttons (#13723)

Change-Id: Id34a8463ff40b1351d4d8b171e561a21fc76d747

Fix misleading message. Close does not always mean reconnect

Change-Id: Ic41189ee138980322204c897b58e29252dfc5cd8

Removed irrelevant readme file

Change-Id: I5b4b93051f16b93482a5fe636381e24ee401b4bc

Ignore irrelevant header lines in checkstyle configuration

* Ignores the empty lines that may have trailing white-space in the
  license header. This allows formatting of the license header either
with or without trailing white-space, which differs between different
versions of Eclipse (as well as between IDEs).

Change-Id: If97d2cfe169accd6d05e44521c9ca5265d715772

DevelopmentServletLoader: Reload servlet container

- Add a couple of parameters in order make jetty context
  reload whenever a class is modified.
- Remove deprecated SSL API calls.

Change-Id: I737fb92e78ce5573a4473639f25fcdad606f3c55

Javadoc added to com.vaadin.ui.Field interface (#13209)

Change-Id: Iad7381e59dfe7a6ea9cb4a633e2c411ebdd1a79d

Fix header and Javadoc issues

Change-Id: I171067273aedc7248e9c044bea0ebf67155fd7a9

Fix DisabledDateFieldPopup test

Change-Id: I27f43e5bed2a0ebc0f04a1a83c922de42fb1a3c5

Remove non-existant theme-compiler from launch

Change-Id: I0d438ebee1b922a2d6eeae6abb0cd69c16848620

Remove the automerge script

This makes it impossible to run this script by mistake, as it should
no longer be used with the new master based workflow.

Change-Id: I0400ecb20bb135c09e0414196f692dd8e9ffa510

Disable border width storing from TabSheet (#13706)

Change-Id: Ibf6ee26e3a1a6604bb850355855c4ef53b9bafc2

Merge changes from origin/7.2 into master

Conflicts:
build.properties
client/src/com/vaadin/client/ApplicationConnection.java
client/src/com/vaadin/client/extensions/ResponsiveConnector.java
server/src/com/vaadin/server/Responsive.java

Change-Id: I49f90521611d1b86704a60c3d003cdeea9c3b864

Fast-forward DateField only with left mouse button (#8012)

Change-Id: Ib21c650feeed1ca584b2aeefb6c694e73e12b90d

Merge changes from origin/7.2

08b0589 Refactored TimeoutRedirectResetsOnActivity tests.

Conflicts:
uitest/src/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java

Change-Id: Id2dc47cb5396a24c97a2689c1412b29a421ac400

Merge changes from origin/7.2

591996b Updated javadoc copyright years.

Change-Id: I50856e97c276b6a6c073be34b6f4faf042e7fab6

Merge changes from origin/7.2

15e24ec Fix too wide Table columns while sorting from init (#13517)
a86798c Fix ScreenshotTB3Test removing reference images

Change-Id: Iec1c2caceb99a6c8cfad9a0911d4a9cd7a23db36

Set explicit left alignment instead of removing text-align style (#13399).

Change-Id: I3407555739ff443055e2e61aa14327d44a65cd8e

Modified vaadinBootstrap to send v-loc as POST instead of GET (#13685).

Since there seems to be no difference, moved also almost all other
parameters from GET to POST for consistency.

Change-Id: I528963c4c832339a9853fbee97cebcb8fabb35e1

Prevent scroll position reset on GridLayout hierarchy change (#13386)

State change handling by default clears measured size if the size is set
to undefined; this would cause GridLayout to shrink to zero size because
its child cells have position: absolute. The layout phase recomputes the
size, but in some cases the browser reflows first, affecting the scroll
position of the layout parent. This patch prevents GridLayout from
clearing once-computed sizes during state change.

Change-Id: Id6e066c3ea360083d16d3fcc5c6d7d4bb6cea8b7

Replace DragStartModes TB2 test with TB3 test

Change-Id: Ief8c36aeeff2026b4beb7d73ab61f13721a2fd4f

Avoid client side exception on DnD for empty table (#13655).

Change-Id: I71c18e87760ecbff34cfe215f56390fd75f3e55c

Fix ComboBox cleared suggestion popup on ItemSetChange (#13635)

Change-Id: I77285e17819daf1b8328a8aea6d62a6b6b53510c

Fix Table width calculation when adding the first item (#13592)

Change-Id: I328dd83cac0cc6ba08fa32a1227f10ece9b52d6f

Ensure session is set before writing timeout interval (#13617)

Change-Id: I4a4f85fe400b9d6e60b81fd5c6c8dbc3b3eac02c

Fix ComboBox popup scrolling when paging disabled (#13488)

Added pagelength == 0 conditions on scroll and hasNextPage.

Change-Id: I42c0eb56d42cc54ff57a6bc6b9eee2f6734315bb

Fix TextArea with enter keyboard shortcut (#12424)

When a keyboardshortcut has been added to anywhere on the page,
the previous behaviour would cause the keyboardshortcut event to
be processeed before the newline was processed. The end result
was that newlines were never added when typing in the TextArea.

Keyboard shortcuts operate on KeyDown events. By adding a listener
for these events and stopping their propagation when the ENTER key
is pressed, this unwanted behaviour can be averted, and the user
can enter multi-line text in a TextArea even when Enter is used as
a keyboard shortcut.

Obviously, this means that the keyboard shortcut will not work as
long as the TextArea widget has focus. This is the new intended
behaviour.

Change-Id: Ied438acb8589df498e5634271e486517bf6ac41e

Update uitest/ivy.xml to use TestBench 4.0.0.alpha1 (#13625)

Change-Id: I141ffe924bb404bc282a6c7c81e5203a7c5cfda0

Apply layout after remove tab in Accordion (#11366, #13423)

Change-Id: Ia56729d2d533697bea78bdb1de6b2710e166893a

Fix missing TreeTable column lines in IE8 (#12989)

Change-Id: Iddc6ecd5f455d28a43a67cdbf22cf81dbf3a6a5b

Fix Table.sort(...) to update the sort indicator (#8978)

Change-Id: I2df7de7648a8a311a913267ef0d0d0e57f52f19d

Report an error if RPC interface is parameterized (#10392).

Change-Id: I887c14b1df282c56a1e839eae5a4534501fa3911

Disable test which changes global behavior of the servlet

Change-Id: Ia9249d76e12217089d9214573a4363fdde94d1e4

Support running tests on PhantomJS

Change-Id: I32bda24fbb8a104a9867b7889a74d3c159bbf516

Update remaining copyright years to 2014

Change-Id: I1fc2bd735b538ebac6d4f41fc8536f26795cc85f

Merge changes from origin/7.1

9c29442 Replace SelectionRangeDragging TB2 test with TB3 test
9fa230d Avoid eagerly layouting from VScrollTable.updateFromUIDL (#13188)

Change-Id: I4f1395a13e8b1eae44a0030a3679475a3db9160a

Merge changes from origin/7.1

e77e73c Update copyright year to 2014

Conflicts:
client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
client/src/com/vaadin/client/ApplicationConnection.java
server/src/com/vaadin/data/util/converter/StringToNumberConverter.java
shared/src/com/vaadin/shared/ui/ui/PageState.java
shared/src/com/vaadin/shared/ui/window/WindowState.java
theme-compiler/src/com/vaadin/sass/SassCompiler.java
theme-compiler/src/com/vaadin/sass/internal/ScssStylesheet.java
theme-compiler/src/com/vaadin/sass/internal/expression/ArithmeticExpressionEvaluator.java
theme-compiler/src/com/vaadin/sass/internal/expression/BinaryExpression.java
theme-compiler/src/com/vaadin/sass/internal/expression/BinaryOperator.java
theme-compiler/src/com/vaadin/sass/internal/expression/exception/ArithmeticException.java
theme-compiler/src/com/vaadin/sass/internal/expression/exception/IncompatibleUnitsException.java
theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandler.java
theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java
theme-compiler/src/com/vaadin/sass/internal/handler/SCSSErrorHandler.java
theme-compiler/src/com/vaadin/sass/internal/parser/CharStream.java
theme-compiler/src/com/vaadin/sass/internal/parser/Generic_CharStream.java
theme-compiler/src/com/vaadin/sass/internal/parser/LexicalUnitImpl.java
theme-compiler/src/com/vaadin/sass/internal/parser/LocatorImpl.java
theme-compiler/src/com/vaadin/sass/internal/parser/MediaListImpl.java
theme-compiler/src/com/vaadin/sass/internal/parser/ParseException.java
theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
theme-compiler/src/com/vaadin/sass/internal/parser/ParserConstants.java
theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java
theme-compiler/src/com/vaadin/sass/internal/parser/SCSSLexicalUnit.java
theme-compiler/src/com/vaadin/sass/internal/parser/SCSSParseException.java
theme-compiler/src/com/vaadin/sass/internal/parser/SelectorListImpl.java
theme-compiler/src/com/vaadin/sass/internal/parser/Selectors.java
theme-compiler/src/com/vaadin/sass/internal/parser/ThrowedParseException.java
theme-compiler/src/com/vaadin/sass/internal/parser/Token.java
theme-compiler/src/com/vaadin/sass/internal/parser/TokenMgrError.java
theme-compiler/src/com/vaadin/sass/internal/resolver/ClassloaderResolver.java
theme-compiler/src/com/vaadin/sass/internal/resolver/FilesystemResolver.java
theme-compiler/src/com/vaadin/sass/internal/resolver/ScssStylesheetResolver.java
theme-compiler/src/com/vaadin/sass/internal/resolver/VaadinResolver.java
theme-compiler/src/com/vaadin/sass/internal/selector/SelectorUtil.java
theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/ExtendNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/ForNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/FunctionNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/ImportNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/KeyframesNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/ListContainsNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/ListModifyNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/ListRemoveNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/MediaNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/MicrosoftRuleNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/MixinDefNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/MixinNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/NestPropertiesNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/Node.java
theme-compiler/src/com/vaadin/sass/internal/tree/RuleNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/SimpleNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/VariableNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/EachDefNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/IfElseDefNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/IfNode.java
theme-compiler/src/com/vaadin/sass/internal/util/ColorUtil.java
theme-compiler/src/com/vaadin/sass/internal/util/DeepCopy.java
theme-compiler/src/com/vaadin/sass/internal/util/FastByteArrayInputStream.java
theme-compiler/src/com/vaadin/sass/internal/util/FastByteArrayOutputStream.java
theme-compiler/src/com/vaadin/sass/internal/util/StringUtil.java
theme-compiler/src/com/vaadin/sass/internal/visitor/BlockNodeHandler.java
theme-compiler/src/com/vaadin/sass/internal/visitor/EachNodeHandler.java
theme-compiler/src/com/vaadin/sass/internal/visitor/ExtendNodeHandler.java
theme-compiler/src/com/vaadin/sass/internal/visitor/IfElseNodeHandler.java
theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java
theme-compiler/src/com/vaadin/sass/internal/visitor/MixinNodeHandler.java
theme-compiler/src/com/vaadin/sass/internal/visitor/NestedNodeHandler.java
theme-compiler/src/com/vaadin/sass/internal/visitor/VariableNodeHandler.java
theme-compiler/tests/src/com/vaadin/sass/AbstractTestBase.java
theme-compiler/tests/src/com/vaadin/sass/internal/expression/ArithmeticExpressionEvaluatorTest.java
theme-compiler/tests/src/com/vaadin/sass/parser/ParserTest.java
theme-compiler/tests/src/com/vaadin/sass/resolvers/VaadinResolverTest.java
theme-compiler/tests/src/com/vaadin/sass/testcases/css/Interpolation.java
theme-compiler/tests/src/com/vaadin/sass/testcases/css/Selectors.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/AbstractDirectoryScanningSassTests.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/AutomaticSassTests.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Comments.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ControlDirectives.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Extends.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Functions.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Imports.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Mixins.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/NestedProperties.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Nesting.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentImports.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentSelector.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/SassLangTests.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/SassLangTestsBroken.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/SassTestRunner.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Variables.java
theme-compiler/tests/src/com/vaadin/sass/tree/ImportNodeTest.java
uitest/src/com/vaadin/tests/push/BasicPushTest.java
uitest/src/com/vaadin/tests/push/PushConfigurationTest.java
uitest/src/com/vaadin/tests/push/PushReconnectTest.java

Change-Id: Ic08c4f9aecd4c684ce74408de4e0b0d0ff617273

Merge changes from origin/7.1

0d4080b ContainerEventProvider returns style names from container. Fixes #10718
6e91bdf Add test for TransactionalPropertyWrapper memory leaks
f0aaf89 Fixed resetting of ComboBox if focused and new items allowed (#13413).
e033fcd Always initialize WebBrowser for new sessions (#13571)
168de1f Revert "Drag image for text-area should contain text of text-area (#13557)"
35e2a34 Fix FieldGroup and TransactionalPropertyWrapper memory leaks (#13438)
7e5d44d Introduce a drag threshold for Drag and Drop (#13381)
f227f0c Drag image for text-area should contain text of text-area (#13557).

Change-Id: Idb01471f8ab0c7118fa884c364e6bc200d13948a

Clarify comments in Table.typeIsCompatible (#8168)

Change-Id: Idc9b2e2052afe2b5586904c535674ec686bb4685

Fix findUI throwing NullPointerException when extending Vaadin (#13556)

findUI sometimes threw a NPE when the session wasn't set but the UI ID
was. Doesn't occur in normal use, just when doing custom things with
requestStart/requestEnd or runPendingAccessTasks
Change-Id: Id7733567923fa30dcab4946c43b73200c2a0fac2

Add caching support for PublishedFileHandler (#13574)

Add caching support for PublishedFileHandler similar to VaadinServlet.
Testing is done manually as browser caching is difficult to develop
tests for.

Change-Id: I314745766c9feb60758547dba77eb9e13976ce91

Fixed javadoc XHTML to HTML and fixed typos (#13518)

Change-Id: I9a61031b0ba786098db51d77d8c73dc9fb36aeb9

Clean Table.propertyValueConverters if the property is removed (#8168)

Clean Table.propertyValueConverters if the property it attached to
is removed, or if the container is changed and the new container does
not contain a property with that identifier with a matching type.

Change-Id: I894ee6462ea7b9c1f9138a24fcb84db829165c7d

Javadoc fix

Change-Id: If07374ae79b6970ccdd47e24aecb866bd5bbc838

Avoid eagerly layouting from VScrollTable.updateFromUIDL (#13188)

Closing a modal sub-window at the same time when TreeTable item is
removed, caused the detached Window being re-opened by
WindowConnector.postLayout() call.

This change adds a check in postLayout: continue operation only if the
window is attached to DOM. Or else, log a warning message about the
invalid postLayout call. Another change is in TreeTableConnector and
VScrollTable to disallow Util.notifyParentOfSizeChange(Widget, boolean)
with a boolean 'false' argument, when rendering is in progress. 'false'
causes an immediate LayoutManager.layoutNow() call, which is the main
reason for this issue.

Change-Id: I6f3e331b0feff9e7814ae1d749f6f7812dcd49ac

Clarify lock check assert message if another session is locked (#13473)

Picking this to the 7.2 branch since the other part of the ticket was already included in 7.2.

Change-Id: I1120ad5acd553e22db95e3635fffbd453fd26310
(cherry picked from commit 134c3bb96bfeaf1eab488e685f3b5dce3093e0ef)

Clarify lock check assert message if another session is locked (#13473)

Change-Id: I1120ad5acd553e22db95e3635fffbd453fd26310

Fix test depending on default locale

Change-Id: I4b90e01ddaa4535131df3262ac53a1e2e634b2ac

Use getChildComponents in PopupView instead of getChildren (#13503)

Change-Id: Ifd155376804e2403c55a115186df2b2c1c673334

Merge changes from origin/7.1

08b0589 Refactored TimeoutRedirectResetsOnActivity tests.
5057c59 Added integration test for WebSphere Portal. (#13309)

Change-Id: I50c8a8f6513679dca611889b43782d6ee6089d6c

Replace SelectionRangeDragging TB2 test with TB3 test

Change-Id: Ic60e13b94e550c0457649ef093c8d6269a7efa19

Merge commit '591996b' into 7.2

Conflicts:
build.properties

Change-Id: Ie3cf9bd0af8aba7debf4626d2db77afea37e7cb3

Update copyright year to 2014

Change-Id: Ic77338304dc7e58e49f27dcdaf0bab2e00f5bba6

Merge from 7.1 to 7.2

Merge: no
Change-Id: Ibfe17c35ec72985823389c75a5c3135998443068

ContainerEventProvider returns style names from container. Fixes #10718

ContainerEventProvider doesn't actually return
style names from container in certain situations
(copy-pasted code). This patch fixes the problem.

Change-Id: I512ea260f34a6db0572b614db393699da152fa8d
(cherry picked from commit 4709b75bb47d28630dacbb240bb43de16d972371)

ContainerEventProvider returns style names from container. Fixes #10718

ContainerEventProvider doesn't actually return
style names from container in certain situations
(copy-pasted code). This patch fixes the problem.

Change-Id: I512ea260f34a6db0572b614db393699da152fa8d

Add WebSphere Portal to supported portals in release notes

Change-Id: I2ffadb382d1c8ca42f1525c24c51a441a67404f6

Remove redundant toggling of calendarToggle enabled state (#13124)

With the original changes for #13124 in how calendarToggle is enabled
and disabled, the toggling performed by the connector is no longer
needed and can be removed.

Change-Id: I74fc1c5b2b8768f42f344478c5dad24eef11d8e6

Support for pointer events (#13549)

Added support for pointer events using the “extensible event mechanism” in GWT 2.6

Change-Id: Idac62114fe26536e62609edc944ff9dfef886e1c

Update the tab caption widths when necessary (#13402)

Change-Id: I9c319625da3e4cfc5b49c339f54393f7e12effed

Drag image for text-area should contain text of text-area (#13557).

Change-Id: I4c3da88e80b5516bc8f6dc0eb8020ca4dcdf43fc

Disable/enable text field for DateField on setEnable() method (#13124).

Change-Id: I49222e44f75ff228219042360f1764077da1016c

Add a section on incompatible changes to release-notes (#13502)

Change-Id: I73cc9c7b5509dff0cb5376af9bf4b0ef572add05

Update release-notes for 7.2.0.beta1

Change-Id: I1232c72c3dd8eca5d6223aa9858dac22a5f7817e

Add test for TransactionalPropertyWrapper memory leaks

Change-Id: I69d0d759f95100f1dd9e2dbba57ec2c246e3aca9

Merge changes from origin/7.2

e697d8b Merge "Merge branch 'master' into 7.2" into 7.2
4879639 Redo Push reconnect tests.
8314e3c Downgrade Atmosphere client jQuery 2.0.3 -> 1.11.0. (#13374)
dab3e63 Disable PopupView Animations (#13593)
3ba1e69 Update to Atmosphere js 2.1.5.vaadin2 (#13578)

Change-Id: I8205b1d1debeb7c2fd6585021ea76a77abd8403b

No-op merge from origin/7.2

416e2f9 Merge branch 'master' into 7.2

Change-Id: Ib4bfc6c631c66384096be50a3445cd8b64059265

Fixed resetting of ComboBox if focused and new items allowed (#13413).

Change-Id: Ibea81666101ff119e1b3e48726224f369e59b00f

Always initialize WebBrowser for new sessions (#13571)

Change-Id: I3918498d63032f6b507b52634df5b41470363e15

Merge changes from origin/7.2

d2e24fe Update some APIs based on the 7.2 API review comments
758f26b Fix NPE when removing tabsheet (#13402)

Change-Id: Ic23793738c866d3b6d1a376f37dc4a56f72b8e43

Update to Atmosphere js 2.1.5.vaadin2 (#13578)

Change-Id: Ifb209889680cdfeb18eba7c836dc60e3551e5f61

Disable PopupView Animations (#13593)

Change-Id: I450d63abe4e7c4e9fd279fe3a6f6262e2945904b

Downgrade Atmosphere client jQuery 2.0.3 -> 1.11.0. (#13374)

Change-Id: I5103be114ed5c45a533b89b4c973bb5c91d47a8b

Revert "Drag image for text-area should contain text of text-area (#13557)"

This reverts commit f227f0c1068f17e5491bd399d9f5bde16a0c8272.

Synchronising content after IE wraps the given element into a table with
a body causes a NullPointerException on client side.

This patch also contains new API and should be targeted to master branch.

Change-Id: Ia19acd9fa31c7b67507bf797a2bab7c28ea37b4b

Redo Push reconnect tests.

Change-Id: I75330f67f6a57658e95b9510502bf6a1e38924ad

Fix copyright headers not passing the validation

Also let through some other formatting changes that Eclipse insisted on
when saving the touched files.

Change-Id: I319de35c4862555b010d6da6d4a5e096619e2c34

Merge "Merge branch 'master' into 7.2" into 7.2

Merge branch 'master' into 7.2

72d0aa0 Update Window Javadoc based on 7.2 API review changes
ee203f5 Apply abstract ordered layout settings for replaced component (#13568)
02998d8 Updated Window API based on 7.2 API review
cd94b21 Discourage use of setNeedsLayout while a layout is running (#13542)
f374bc7 Make ComboBox always immediate (#4054)
aec102a Update 3rd party license information (#13449)
013d32d Remove old widget from tab content on replace (#12931).
3d0ff32 Prevent duplicate detach() calls with push (#13261)
a452bad Refactor VaadinPortletRequest extending. (#13551)
55dfd29 Prevent duplicate session destroy events (#12612)
2067d4e Don't allocate unnecessary memory for empty array of Objects in MethodProperty (#10446).
00a9af5 Refactor PushConfigurationTest.

Merge: no

Change-Id: I6563769a77f91a68cfeadcb3306dd71fe431863c

Fix FieldGroup and TransactionalPropertyWrapper memory leaks (#13438)

Change-Id: Ifafb6d87b4280f8bd9e631235fff62f42de4b4c8

Fix NPE when removing tabsheet (#13402)

Change-Id: Idc78fc1bc6380d7bfada99f1efe2484b04ce3c74

Merge "Merge branch '7.2'"

Update some APIs based on the 7.2 API review comments

* NotificationConfiguration "helpers" removed from Notification
* NotificationConfiguration methods accept Type instead of style (String)
* Tab.setIconAltText -> Tab.setIconAlternateText
* Remove the two new TabSheet.addTab() methods
* UI.reinit() -> UI.refresh()

Change-Id: I97488e7c6de8cfacc591450d69c821b2973b8707

Update Window Javadoc based on 7.2 API review changes

Change-Id: Ifdc1379892d8f798f2ceabcf83d772fa6a76dd4b

Merge branch '7.2'

51c2e93 Revert "Added ItemSetAddEvent and ItemSetRemoveEvent (#2794)"
ee4ae9f Merge from 7.1 to 7.2

Conflicts:
scripts/automerge7.sh

Change-Id: Ieb61caed4b3b6bbc6d3dc84c02ae8eeed897a144

Apply abstract ordered layout settings for replaced component (#13568).

Change-Id: If6863d518d902ee48bb73fbb0c9b3725cb7c8707

Updated Window API based on 7.2 API review

Change-Id: Ie6fa8b51c2fd1d1fe7def9ca7c11b4023eae52b7

Discourage use of setNeedsLayout while a layout is running (#13542)

Change-Id: Ia4831db39528061f4ac4b98b861b8030a261cf9a

Introduce a drag threshold for Drag and Drop (#13381)

Based on partial fix by Fabian Lange.

Change-Id: I1a18c6ea105d87496b196b93e701aaccb987b3e7

Revert "Added ItemSetAddEvent and ItemSetRemoveEvent (#2794)"

This reverts commit 85251833de3bd101d388b20fdb9b02c532a9f1c9.

Conflicts:
server/src/com/vaadin/data/util/AbstractInMemoryContainer.java
server/tests/src/com/vaadin/data/util/TestIndexedContainer.java

Change-Id: I49dfdc58ae5841892c6d8e205c520437da9a05e5

Make ComboBox always immediate (#4054)

Change-Id: I34525b7d9e78ede7f9533869326ca0c08474963a

Merge from 7.1 to 7.2

Change-Id: I3db340a7c971be6abf18514f044114802edfc4de

Merge from 7.2

Change-Id: Ic52a0be061bf22058ac9b831f3e965547a1b8933

Update 3rd party license information (#13449)

Change-Id: Ib168ea79f80abefb140f1e64e239b5520d0fd3bd