summaryrefslogtreecommitdiffstats
path: root/server/src
Commit message (Collapse)AuthorAgeFilesLines
* Manually merged most important changes from 7.2.6.4Johannes Tuikkala2015-03-241-0/+29
| | | | Change-Id: I04bc18f59bfdcd6d85dbe825f6ad3df44d050ebc
* Revert "Fix Table stuck scroll position after setting scroll to last page ↵Bogdan Udrescu2014-07-301-1/+1
| | | | | | | | | | | | (#14147)" This reverts commit 2ed3a310ca9e32f255602139eb1b08bfdfe2f25f. Conflicts: client/src/com/vaadin/client/ui/VScrollTable.java client/src/com/vaadin/client/ui/table/TableConnector.java Change-Id: Ie18f4ad61a88c17cd2b8eff677836fc68abffc15
* Fix Table stuck scroll position after setting scroll to last page (#14147)Anthony Guerreiro2014-07-291-1/+1
| | | | Change-Id: I9c39db5c2ccafd495a1ecc8b28687eeeebe3b6c2
* TextArea size get reset when css resize is set (#14080)Bogdan Udrescu2014-07-292-29/+42
| | | | | | | Listen to MouseUp event on the <textarea> and notify the state with the width and height if changed. Add com.vaadin.client.Util.Size to manipulates the css width/height. Change-Id: I96a308658d2877f1f6c05feaa7840a268bb06709
* Revert "Add asserts checking for negative container sizes (#14232)"Bogdan Udrescu2014-07-295-10/+2
| | | | | | | This reverts commit c43ebbac50a55e965738ec82c83a3fe08636b911. Reverted because it might actually break some theoretically broken applications that still happen to work by chance.
* Fallback to finding disconnected UI based on AtmosphereResource (#14251)Leif Åstrand2014-07-231-7/+43
| | | | Change-Id: Icdac51322a90c32c122a182bc692c4eff3d8285b
* Improves performance of VaadinService.requestEnd(). (#14218)Fabian Lange2014-07-232-130/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing two times session.accessSynchronously is unnecessary effort in multiple aspects: * The session will be locked twice. * CurrentInstances are set twice. * CurrentInstances are restored twice. * VaadinSession being checked for being the current via VaadinService.verifyNoOtherSessionLocked(this); When we leave requestEnd we unset all CurrentInstances. There is no need to just restore them before doing so. When we are in requestEnd, VaadinSession is set to "current" by PushHandler.callWithUi() or VaadinService.handleRequest(). Also, the cleanupSession code does not need any of these thread locals, so not having them set would also not hurt. having an extra accessSynchronously call for just setting the duration does not make a lot of sense. While it somehow wants to make the previous accessSynchronously call to be counted completely into the duration it invests an the same time that would have been left out additionally. VaadinService removeClosedUIs is a cleanup which also locks and sets CurrentInstances just to figure out that the UI it is checking is not closing. This change moves that check out of ui.accessSynchronously. In the end, the resulting code is a tiny bit less robust, however it eliminates over 50% response time on trivial push request/responses. Change-Id: If71d1dbbae5d1fd57d3d4e735c592fd263261a81
* Fixed javadoc for Upload class (#14266)Heikki Ohinmaa2014-07-231-80/+80
| | | | Change-Id: Ib16d4b8922a139b37d551797ada163b6d6b5e720
* Add asserts checking for negative container sizes (#14232)Leif Åstrand2014-07-235-2/+10
| | | | Change-Id: I5b6298be367e4fe820320a5e3fd6bf5aaa7e2047
* Optimizes initial sizes of frequently used Collections. (#14223)Fabian Lange2014-07-185-201/+210
| | | | | | | | | | | | There are a few places in frequently used core classes which could initialize collection classes with the correct (or slightly oversized) length. Maps are initialized with 2x the size due to its load factor. Change-Id: I3aee5a60602937a8550ca5a200ec2a529ff36fe9 Conflicts: server/src/com/vaadin/server/VaadinService.java
* Update Atmosphere runtime to 2.1.2.vaadin3 (#13971)Sauli Tähkäpää2014-07-161-1/+1
| | | | | | | Atmosphere 2.1.2.vaadin3 includes fix for: https://github.com/Atmosphere/atmosphere/issues/1643 Change-Id: I67c07dc3b32ebb3b0eed634bf143bac9a7e5efe2
* Remove csrfToken if disable-xsrf-protection is true (#14111)Bogdan Udrescu2014-07-161-1/+8
| | | | | | | If the server sends no token and the client value remains "init" then it's not sent back to the server. Change-Id: I74fc470c5c22d57c4a48eab3e4476ae4cc2dd242
* Make it possible to disable the sync id checking (#14193)Leif Åstrand2014-07-165-5/+44
| | | Change-Id: I35c2a767d7726abbbe7bae56387952343ac21157
* Mention Date serialization in javadocs related to JavaScript (#14143)Leif Åstrand2014-07-152-0/+4
| | | | Change-Id: I14d782843684f623a2cf671f14d0ab062829ebac
* Optimize CurrentInstance.set(UI) and .set(VaadinSession). (#14220)Fabian Lange2014-07-141-54/+40
| | | | | | | | | This change reduces the amount of intermediate steps taken to initialize the thread locals for a given ui or vaadin session. It mainly takes advantage of reusing the old values from the map in set() instead of creating new ones to put into the "old" map which is returned. Change-Id: I4dbaff973f46e73f8f3a0c285b14c97603f2d5a4
* removes extra VaadinSession.setCurrent() from PushHandler. (#14222)Fabian Lange2014-07-141-9/+11
| | | | | | | | | The setCurrent call on VaadinSession is not needed. the one extra call can be saved because service.findVaadinSession will already set it. Added a comment like it is done for UI (service.findUI will also set the UI). Change-Id: Ic24d922554d1316aae310813ef5d00a0bbfd418a
* Fix overwrite mechanism for web.xml atmosphere init params (#14196).Fabian Lange2014-07-141-7/+8
| | | | | | | | | | Non obvious problem before. "config" is a property of AtmosphereFramework which also has getInitParameter(String) method. So it compiles but does not do what is intended: to check against the user defined web.xml servlet init-prams. (the variableName servletConfig has the same problem :-)) Change-Id: Ib02f0b94312327d482775456c2d63a904b1e8104
* Reading properties of components should not set state to dirty (#14060).Fabian Lange2014-07-021-8/+12
| | | | | | Fixed issue with SplitPanels which were not marking sets as dirty. Change-Id: I23bb8bfca87a825aef132f249e05871cf7b36a34
* Reading properties of components should not set state to dirty (#14060).Fabian Lange2014-07-027-34/+45
| | | | | | | | | Added Automatic Testcase. The testcase needs a default constructor, which has been added. The test also found an edge case in Form.java which has been corrected, as well as one missing getState(false) in AbstractMedia. Change-Id: Id764c9e1596123015a84f6c2a9507f03bde383b1
* Reading properties of components should not set state to dirty (#14060).Fabian Lange2014-07-022-3/+8
| | | | | | | Adding 3 getStates() which were missed in https://github.com/vaadin/vaadin/commit/0c229ae91460fedaeb557bdc5a646433658b0dfb Change-Id: Ide7949046e4cc3f36c08f419f3010a98e348642c
* Reading properties of components should not set state to dirty (#14060).Fabian Lange2014-07-0222-139/+229
| | | | | | | | Many core vaadin components did incorrectly mark the state as dirty when reading from them. This patch fixes the problem, which should reduce the amount of server->client state updates significantly. Change-Id: I342d74129e2985a7f407e9b53a802dc0146d9992
* Prevent empty tooltips from appearing (#14015)Juuso Valli2014-07-011-1/+1
| | | | Change-Id: Iee9d5be9208ff54cd0e4a58c19daaa3a917f9b9d
* Do not consider compiler introduced methods when determining state class ↵Artur Signell2014-06-271-3/+5
| | | | | | (#14003) Change-Id: Ia2c3b8331f1ae34effceb0bb624cfaa7ba8578ed
* Removes double spacing from gridLayout which has empty rows or columns (#8855)Dmitrii Rogozin2014-06-181-70/+71
| | | | | | | | | | If row has no elements or only invisible elements, its size will be set to zero. When row expand ratio was set, its size will be assigned to the value according to an expand ratio. If component takes several rows of the gridLayout, these rows are considered as non-empty and won't be removed. Change-Id: I10ddd22a6c9535b9978769bab7b496e11a28b78a
* Moved initialization of a static map to the static initialization block (#12270)Teemu Pöntelin2014-06-171-1/+2
| | | | Change-Id: I82c77edf5c17c712350cb64831b305b4c8363cf7
* Allow inlining of JsonCodec#encode (#13814)Fabian Lange2014-06-172-92/+63
| | | | | | | | | | | | | | | | JsonCodec#encode() is a frequently called (hot) method. However in its current form it is too long to be inlined. This review reduces the length of the method from 454 bytes instructions to 311 and optimises flow of common calls. It however has a behaviour change for esoteric edge cases where the order would matter. Like a custom collection which extends JSONArray and implements collection. Previously it would have been handled by the collection case, now its the JSONArray case. However it can be assumed that the result: serialized to valid JSON is the same. Change-Id: Ia552eec6322d0760581336b8b038fa03761c1d69
* Allow use of Collection<String> and others with addItems (#13865)Artur Signell2014-06-041-1/+1
| | | | Change-Id: Ie5c0a00b65d27f65522a14c4fbcd05fe21814cc0
* Fix Push update race condition (#13562)Juuso Valli2014-05-271-2/+9
| | | | | | | Change-Id: I50094bc2d236f6dbb02a8b82d6cc9b5f7e4733a5 Conflicts: uitest/src/com/vaadin/tests/components/table/ContainerSizeChangeTest.java
* Properly deserialize push connection (#12235)Johannes Dahlström2014-05-273-8/+28
| | | | | | | | | | The UI.pushConnection field is transient no longer; instead PushConnection implementations must take care of serialization internally. When a session is serialized, the client should notice that push was disconnected and try to reconnect. A deserialized PushConnection should be in a "disconnected" state so the eventual client reconnection works correctly. Change-Id: I38cfc5a5cdbd3643311f830f8d580458dcd85c56
* Optimizes ConnectorTracker.cleanConnectorMap (#13803)Fabian Lange2014-05-271-45/+32
| | | | | | | | | | | | | | | cleanConnectorMap is a hot method. This change improves multiple code paths: 1) The global resource handler is no longer get()ed from the session for each connector (was in two loops). 2) The ConnectorTracker is no longer get()ed from the UI for each connector (was in one loop). 3) values() iterator for ClientConnectors replaces keySet() iterator + get(key) call 4) use getUI() from ClientConnector instead manual method. 5) moved removeUnregisteredConnectors to ease inlining and readability. Change-Id: I25ff5bc32d27d30ecd8d354922ec6e4a02b05921
* Optimize getAllChildrenIterable() performance. (#13803)Fabian Lange2014-05-271-1/+4
| | | | | | | | | | | | | | | getAllChildrenIterable() is invoked frequently, its used by attach/detach and markAsDirty. Because of the implementation detail in CombinedIterator, on every call all iterators are checked. This means that on every component which has multiple childs, each next() call will first check the extension iterator, before advancing in the child iterator. By having the childs first, this overhead is reduced. If no extensions are existing (which is quite common) the iterator is not added at all. (creating an iterator on an empty UnmodifiableCollection is waste of time and memory) Change-Id: I23bb91464052ad4282963ec4b5be8a52c6847d4f
* Prevent adding/setting parent component as child (#12720).Denis Anisimov2014-05-273-9/+30
| | | | Change-Id: I9b7b43f176e88d9edca591001297b94475a31854
* Revert "Fix Push inserts producing duplicate rows in Table (#13562)"Sauli Tähkäpää2014-05-261-10/+2
| | | | This reverts commit ce1764fb1bad1b82462d73fbfe293b676c2a9c00.
* Fix Push inserts producing duplicate rows in Table (#13562)Juuso Valli2014-05-231-2/+10
| | | | Change-Id: I050553b233fb7024049c31d9495d90f4d88239c8
* Allow editing colorpicker values in colorpicker in textfield #13469John Ahlroos2014-05-231-19/+57
| | | | | | | | This fix adds support for typing in color values according to http://www.w3schools.com/cssref/css_colors_legal.asp into the colorpicker popup input textfield. Change-Id: If14ead791725c3052c05aa31e12e237e90c32348
* Actually close push connection in disconnect() (#13716)Artur Signell2014-05-081-0/+6
| | | | Change-Id: I342633f1caa5746472d29bbb7b71590674adc04c
* Fix improper merge of 3d0ff32b from 7.1 to master (#13620)Johannes Dahlström2014-05-081-41/+6
| | | | | | | Correctly call PushConnection.disconnect instead of setting to null. Also remove the obsolete PushHandler.disconnectCallback. Change-Id: Ied055d489a269b016318947cd89cf0b46003c596
* Javadoc added to com.vaadin.ui.Field interface (#13209)Dmitrii Rogozin2014-05-051-15/+24
| | | | Change-Id: Iad7381e59dfe7a6ea9cb4a633e2c411ebdd1a79d
* Fix header and Javadoc issuesTeemu Suo-Anttila2014-05-052-2/+2
| | | | Change-Id: I171067273aedc7248e9c044bea0ebf67155fd7a9
* Merge changes from origin/7.2 into masterJonatan Kronqvist2014-05-05439-513/+532
|\ | | | | | | | | | | | | | | | | | | 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
| * Update remaining copyright years to 2014Artur Signell2014-04-236-6/+6
| | | | | | | | Change-Id: I1fc2bd735b538ebac6d4f41fc8536f26795cc85f
| * Merge changes from origin/7.1Artur Signell2014-04-23433-494/+494
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Update copyright year to 2014Artur Signell2014-04-16432-494/+494
| | | | | | | | | | | | Change-Id: Ic77338304dc7e58e49f27dcdaf0bab2e00f5bba6
| * | Merge changes from origin/7.1Artur Signell2014-04-236-14/+33
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * ContainerEventProvider returns style names from container. Fixes #10718Maciej Przepióra2014-04-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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)
| | * Add test for TransactionalPropertyWrapper memory leaksTeemu Suo-Anttila2014-04-141-1/+1
| | | | | | | | | | | | Change-Id: I69d0d759f95100f1dd9e2dbba57ec2c246e3aca9
| | * Always initialize WebBrowser for new sessions (#13571)Leif Åstrand2014-04-143-5/+4
| | | | | | | | | | | | Change-Id: I3918498d63032f6b507b52634df5b41470363e15
| | * Fix FieldGroup and TransactionalPropertyWrapper memory leaks (#13438)Teemu Suo-Anttila2014-04-142-7/+27
| | | | | | | | | | | | Change-Id: Ifafb6d87b4280f8bd9e631235fff62f42de4b4c8
| * | Clarify lock check assert message if another session is locked (#13473)Leif Åstrand2014-04-171-2/+11
| | | | | | | | | | | | | | | | | | 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)
| * | Merge branch 'master' into 7.2Jonatan Kronqvist2014-04-1410-149/+343
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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