aboutsummaryrefslogtreecommitdiffstats
path: root/server
Commit message (Collapse)AuthorAgeFilesLines
...
| * Remove VaadinServlet.handleServiceSecurityException (#14082)Leif Åstrand2014-06-271-36/+0
| | | | | | | | Change-Id: I80029235997e29e0d430bccfd3a7b050598e4031
* | Merge branch 'master' into valoJouni Koivuviita2014-06-271-5/+22
|\| | | | | | | Change-Id: Iffe877e047ee29dbd4e5b3a6098f82da3d0a47cc
| * Allow changing theme on the fly (#2874)Artur Signell2014-06-261-5/+22
| | | | | | | | Change-Id: I70c153c4109428686002f985bfe1cb7cba2c9b31
* | Merge branch 'master' into valoJouni Koivuviita2014-06-2631-180/+393
|\| | | | | | | Change-Id: I9f804f3ba10922a3d59999df06a23f2daa4cd4e8
| * Don't complain about missing sync id for critical notifications (#14081)Leif Åstrand2014-06-251-0/+2
| | | | | | | | Change-Id: I351d256230a5cd674a5e1b8066d3e2aef07ff3bf
| * Updated javadoc to indicate which Font Awesome version is included (#14070)Marc Englund2014-06-251-0/+3
| | | | | | | | Change-Id: I51c0722bda9941d16a5f6aad0ce7dfd4a4753587
| * Reading properties of components should not set state to dirty (#14060).Fabian Lange2014-06-248-34/+145
| | | | | | | | | | | | | | | | | | 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-06-232-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-06-2322-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
| * Do not consider compiler introduced methods when determining state class ↵Artur Signell2014-06-181-3/+5
| | | | | | | | | | | | (#14003) Change-Id: Ia2c3b8331f1ae34effceb0bb624cfaa7ba8578ed
| * Prevent empty tooltips from appearing (#14015)Juuso Valli2014-06-181-1/+1
| | | | | | | | Change-Id: Iee9d5be9208ff54cd0e4a58c19daaa3a917f9b9d
* | Add Java constants for all additional Valo theme style names (#14030)Jouni Koivuviita2014-06-251-0/+809
|/ | | | | | | Most style names documented. Some still missing, and a few with TODO placeholders. Change-Id: I9388e3b8fb9c23a8f25f47e963a896e0a0606a95
* Removes double spacing from gridLayout which has empty rows or columns (#8855)Dmitrii Rogozin2014-06-111-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
* Allow inlining of JsonCodec#encode (#13814)Fabian Lange2014-06-092-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
* Moved initialization of a static map to the static initialization block (#12270)Teemu Pöntelin2014-06-061-1/+2
| | | | Change-Id: I82c77edf5c17c712350cb64831b305b4c8363cf7
* Allow use of Collection<String> and others with addItems (#13865)Artur Signell2014-05-282-1/+77
| | | | Change-Id: Ie5c0a00b65d27f65522a14c4fbcd05fe21814cc0
* Fix Push update race condition (#13562)Juuso Valli2014-05-271-2/+9
| | | | Change-Id: I50094bc2d236f6dbb02a8b82d6cc9b5f7e4733a5
* Properly deserialize push connection (#12235)Johannes Dahlström2014-05-264-8/+84
| | | | | | | | | | 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
* Revert "Fix Push inserts producing duplicate rows in Table (#13562)"Sauli Tähkäpää2014-05-261-10/+2
| | | | | | This reverts commit ce1764fb1bad1b82462d73fbfe293b676c2a9c00. Change-Id: I897e0f3a0876eaea4b68f0e3b75671ccb1398242
* Javadoc correctionArtur Signell2014-05-221-4/+4
| | | | Change-Id: I58c89f6c8b2c72e233b1d9e5413da1d6cbc36285
* Helpers for retrieving the current PortletRequest (#13806)Artur Signell2014-05-222-3/+65
| | | | Change-Id: I5d400a05071844729d68abb1ba0c31c33e32e9c7
* Optimizes ConnectorTracker.cleanConnectorMap (#13803)Fabian Lange2014-05-221-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-221-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-225-9/+139
| | | | Change-Id: I9b7b43f176e88d9edca591001297b94475a31854
* Remove some unnecessary semicolonsLeif Åstrand2014-05-222-3/+3
| | | | Change-Id: I8698a9ecf691adde9a3bc2e92047be5f3036df1e
* Adds methods for setting only width or height undefined #13546John Ahlroos2014-05-212-0/+40
| | | | Change-Id: Ieebe48c75370c0744a2a2619e1ed81dbd090a544
* Don't use deprecated Assert classLeif Åstrand2014-05-1635-54/+43
| | | | Change-Id: I0dbef06d0fa319628f6fa528f5ab3adfd5752c11
* Fix Push inserts producing duplicate rows in Table (#13562)Juuso Valli2014-05-151-2/+10
| | | | Change-Id: I050553b233fb7024049c31d9495d90f4d88239c8
* Allow editing colorpicker values in colorpicker in textfield #13469John Ahlroos2014-05-142-19/+114
| | | | | | | | 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-05495-571/+706
|\ | | | | | | | | | | | | | | | | | | 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-2322-24/+24
| | | | | | | | Change-Id: I1fc2bd735b538ebac6d4f41fc8536f26795cc85f
| * Merge changes from origin/7.1Artur Signell2014-04-23473-535/+535
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-16470-533/+533
| | | | | | | | | | | | Change-Id: Ic77338304dc7e58e49f27dcdaf0bab2e00f5bba6
| * | Merge changes from origin/7.1Artur Signell2014-04-238-14/+181
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-162-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | 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-142-1/+117
| | | | | | | | | | | | 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-1419-152/+996
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Ensure session is set before writing timeout interval (#13617)Artur Signell2014-04-282-1/+97
| | | | | | | | | | | | | | | | Change-Id: I4a4f85fe400b9d6e60b81fd5c6c8dbc3b3eac02c
* | | | Fix Table.sort(...) to update the sort indicator (#8978)Juuso Valli2014-04-251-1/+9
| | | | | | | | | | | | | | | | Change-Id: I2df7de7648a8a311a913267ef0d0d0e57f52f19d
* | | | Clarify comments in Table.typeIsCompatible (#8168)Juuso Valli2014-04-231-16/+2
| | | | | | | | | | | | | | | | Change-Id: Idc9b2e2052afe2b5586904c535674ec686bb4685
* | | | Fix findUI throwing NullPointerException when extending Vaadin (#13556)Juuso Valli2014-04-232-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)Juuso Valli2014-04-231-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add caching support for PublishedFileHandler similar to VaadinServlet. Testing is done manually as browser caching is difficult to develop tests for. Change-Id: I314745766c9feb60758547dba77eb9e13976ce91
* | | | Clean Table.propertyValueConverters if the property is removed (#8168)Juuso Valli2014-04-232-9/+445
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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