summaryrefslogtreecommitdiffstats
path: root/server/src
Commit message (Collapse)AuthorAgeFilesLines
...
* 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
* Mention Date serialization in javadocs related to JavaScript (#14143)Leif Åstrand2014-07-152-0/+4
| | | | Change-Id: I14d782843684f623a2cf671f14d0ab062829ebac
* Remove csrfToken if disable-xsrf-protection is true (#14111)Bogdan Udrescu2014-07-151-1/+7
| | | | | | | If the server sends no token and the client value remains "init" then it's not sent back to the server. Change-Id: I74fc470c5c22d57c4a48eab3e4476ae4cc2dd242
* Optimizes initial sizes of frequently used Collections. (#14223)Fabian Lange2014-07-145-195/+205
| | | | | | | | | 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
* 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-101-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
* Cache sass output compiled on the fly by VaadinServlet (#9532)Leif Åstrand2014-07-101-26/+108
| | | | Change-Id: I5ce36a5c3beffe7b686a8754b6f7311d83b00f87
* Avoid object creation in getAllChildrenIterable in most cases. (#14142)Fabian Lange2014-07-042-63/+57
| | | | | | | | | | | | API change from: public static Iterable<ClientConnector> getAllChildrenIterable(final ClientConnector connector) to public static Iterable<? extends ClientConnector> getAllChildrenIterable(final ClientConnector connector) avoids creating wrappers in case the component has either no subcomponents or no extensions. This covers the vast majority of components. Change-Id: I48ffd2f26f09c265fae6e1aaabdbaa655d52ffb8
* Revert "Allow changing theme on the fly (#2874)"Henri Sara2014-07-031-22/+5
| | | | | | | | | | | | | | | | This reverts commit 1b73b00b2875c5eafa3c641b77f5d9efc2f7d929 as well as the related changes to @since, release notes etc. Conflicts: client/src/com/vaadin/client/ResourceLoader.java client/src/com/vaadin/client/communication/TranslatedURLReference.java client/src/com/vaadin/client/ui/ui/UIConnector.java server/src/com/vaadin/ui/UI.java shared/src/com/vaadin/shared/ui/ui/UIState.java uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java Change-Id: Id882dc730f51055f6d17200964bcaf8a1f87a35f
* Add missing @since 7.3 to javadocHenri Sara2014-07-035-5/+7
| | | | Change-Id: I62610ef647fbbb5a7cfae25ac5c7628f78f2c6ff
* Reading properties of components should not set state to dirty (#14060).Fabian Lange2014-07-011-8/+12
| | | | | | Fixed issue with SplitPanels which were not marking sets as dirty. Change-Id: I23bb8bfca87a825aef132f249e05871cf7b36a34
* Add conf option for disabling sync id checking (#14084)Leif Åstrand2014-07-015-5/+52
| | | | Change-Id: If3fcc88e69d797b219f5af5906853a42d81f693c
* Ignore -1 sync id on the server (#14084)Leif Åstrand2014-07-011-2/+15
| | | | Change-Id: Iad73c44852c207f29381d59bea25275ac8f24dbd
* Merge branch 'master' into valoHenri Sara2014-06-301-36/+0
|\ | | | | | | Change-Id: Ifeb36e6c0acd156b7714f96f32ad7d4ff8416100
| * 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-2630-180/+293
|\| | | | | | | 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-247-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-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-281-1/+1
| | | | 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-263-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
* 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-223-9/+30
| | | | Change-Id: I9b7b43f176e88d9edca591001297b94475a31854
* Remove some unnecessary semicolonsLeif Åstrand2014-05-221-2/+2
| | | | Change-Id: I8698a9ecf691adde9a3bc2e92047be5f3036df1e
* Adds methods for setting only width or height undefined #13546John Ahlroos2014-05-212-0/+40
| | | | Change-Id: Ieebe48c75370c0744a2a2619e1ed81dbd090a544
* 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-141-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