Artur Signell
9b3df561fe
Actually close push connection in disconnect() ( #13716 )
...
Change-Id: I342633f1caa5746472d29bbb7b71590674adc04c
2014-05-08 18:09:34 +00:00
Johannes Dahlström
f21c10882e
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
2014-05-08 17:36:22 +00:00
Dmitrii Rogozin
66f9563bed
Javadoc added to com.vaadin.ui.Field interface ( #13209 )
...
Change-Id: Iad7381e59dfe7a6ea9cb4a633e2c411ebdd1a79d
2014-05-05 17:17:35 +03:00
Teemu Suo-Anttila
27f6503eb1
Fix header and Javadoc issues
...
Change-Id: I171067273aedc7248e9c044bea0ebf67155fd7a9
2014-05-05 17:05:12 +03:00
Jonatan Kronqvist
0745a29a95
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
2014-05-05 11:43:28 +03:00
Artur Signell
9768fa59bc
Ensure session is set before writing timeout interval ( #13617 )
...
Change-Id: I4a4f85fe400b9d6e60b81fd5c6c8dbc3b3eac02c
2014-04-28 07:03:48 +00:00
Juuso Valli
2cfa64db4f
Fix Table.sort(...) to update the sort indicator ( #8978 )
...
Change-Id: I2df7de7648a8a311a913267ef0d0d0e57f52f19d
2014-04-25 07:39:24 +00:00
Artur Signell
2c8c29e68b
Update remaining copyright years to 2014
...
Change-Id: I1fc2bd735b538ebac6d4f41fc8536f26795cc85f
2014-04-23 21:04:14 +03:00
Artur Signell
e2db3e777a
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
2014-04-23 20:52:07 +03:00
Artur Signell
41cb27e85f
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
2014-04-23 20:45:39 +03:00
Juuso Valli
716046af83
Clarify comments in Table.typeIsCompatible ( #8168 )
...
Change-Id: Idc9b2e2052afe2b5586904c535674ec686bb4685
2014-04-23 13:38:51 +00:00
Juuso Valli
2e58e97e52
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
2014-04-23 13:37:18 +00:00
Juuso Valli
eeb956bc64
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
2014-04-23 11:06:37 +00:00
Juuso Valli
e77818472d
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
2014-04-23 08:44:42 +00:00
Leif Åstrand
9f30eb2852
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 134c3bb96b
)
2014-04-17 07:54:59 +00:00
Leif Åstrand
134c3bb96b
Clarify lock check assert message if another session is locked ( #13473 )
...
Change-Id: I1120ad5acd553e22db95e3635fffbd453fd26310
2014-04-17 07:47:43 +00:00
Juuso Valli
83b40dd4a0
Fix test depending on default locale
...
Change-Id: I4b90e01ddaa4535131df3262ac53a1e2e634b2ac
2014-04-17 07:17:55 +00:00
Artur Signell
e77e73cf64
Update copyright year to 2014
...
Change-Id: Ic77338304dc7e58e49f27dcdaf0bab2e00f5bba6
2014-04-16 11:17:52 +00:00
Maciej Przepióra
0d4080ba5e
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 4709b75bb4
)
2014-04-16 07:52:18 +00:00
Maciej Przepióra
4709b75bb4
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
2014-04-16 07:37:51 +00:00
Teemu Suo-Anttila
6e91bdf422
Add test for TransactionalPropertyWrapper memory leaks
...
Change-Id: I69d0d759f95100f1dd9e2dbba57ec2c246e3aca9
2014-04-14 17:58:18 +00:00
Leif Åstrand
e033fcda35
Always initialize WebBrowser for new sessions ( #13571 )
...
Change-Id: I3918498d63032f6b507b52634df5b41470363e15
2014-04-14 13:36:31 +00:00
Artur Signell
dd2b91a240
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
2014-04-14 15:44:10 +03:00
Leif Åstrand
c544c6cbfa
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
2014-04-14 09:10:07 +00:00
Jonatan Kronqvist
416e2f97bc
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
2014-04-14 12:06:05 +03:00
Teemu Suo-Anttila
35e2a34c9c
Fix FieldGroup and TransactionalPropertyWrapper memory leaks ( #13438 )
...
Change-Id: Ifafb6d87b4280f8bd9e631235fff62f42de4b4c8
2014-04-14 09:03:50 +00:00
Artur Signell
eda9edcbde
Merge "Merge branch '7.2'"
2014-04-14 08:48:04 +00:00
Jonatan Kronqvist
d2e24feb09
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
2014-04-14 11:43:18 +03:00
Leif Åstrand
72d0aa0b82
Update Window Javadoc based on 7.2 API review changes
...
Change-Id: Ifdc1379892d8f798f2ceabcf83d772fa6a76dd4b
2014-04-14 08:34:22 +00:00
Jonatan Kronqvist
1b5b02f878
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
2014-04-14 11:28:18 +03:00
Denis Anisimov
ee203f581a
Apply abstract ordered layout settings for replaced component ( #13568 ).
...
Change-Id: If6863d518d902ee48bb73fbb0c9b3725cb7c8707
2014-04-14 08:15:51 +00:00
Artur Signell
02998d815a
Updated Window API based on 7.2 API review
...
Change-Id: Ie6fa8b51c2fd1d1fe7def9ca7c11b4023eae52b7
2014-04-14 05:00:01 +00:00
Jonatan Kronqvist
51c2e93172
Revert "Added ItemSetAddEvent and ItemSetRemoveEvent ( #2794 )"
...
This reverts commit 85251833de
.
Conflicts:
server/src/com/vaadin/data/util/AbstractInMemoryContainer.java
server/tests/src/com/vaadin/data/util/TestIndexedContainer.java
Change-Id: I49dfdc58ae5841892c6d8e205c520437da9a05e5
2014-04-11 11:16:58 +00:00
Jonatan Kronqvist
f374bc72f5
Make ComboBox always immediate ( #4054 )
...
Change-Id: I34525b7d9e78ede7f9533869326ca0c08474963a
2014-04-11 06:17:48 +00:00
Johannes Dahlström
ca90352bf4
Merge commit '3d0ff32bea81c3e3c64bd044276ff04a4f8555ed'
...
Conflicts:
server/src/com/vaadin/server/communication/AtmospherePushConnection.java
server/src/com/vaadin/server/communication/PushHandler.java
Change-Id: I93b5c3f3017aaa1ba2a231028c808d6e56fe1c11
2014-04-10 16:47:52 +03:00
Sauli Tähkäpää
a452badd69
Refactor VaadinPortletRequest extending. ( #13551 )
...
Change-Id: Ibe169bf0ec6d2f335e099ac2659079c8fad6ac0b
2014-04-10 11:28:48 +00:00
Johannes Dahlström
55dfd2936a
Prevent duplicate session destroy events ( #12612 )
...
Change-Id: Ic752268a9deac350dbff29ecf73cfce2eb1ba0cc
2014-04-10 11:18:20 +00:00
Denis Anisimov
2067d4e010
Don't allocate unnecessary memory for empty array of Objects in
...
MethodProperty (#10446 ).
Change-Id: Ib8e2cfb42494a9dd3efb5ca62ddea9675a1dab1e
2014-04-10 10:11:03 +00:00
Fabian Lange
52db8e5457
Optimizes memory and CPU usage in JSONCodec ( #13545 )
...
The null element and the empty JSONArray are frequently created and used
as temporary objects to be encoded by the json encoder. Because they are
never manipulated it is possible to reuse the same empty element again
and save a significant amount of temp objects.
This also helps jsonEquals, which then can return faster due to:
if (fieldValue == referenceValue) return true
jsonEquals does not need to check the referenceValue for JSONobject.NULL.
The invoking code makes sure this never happens.
Boolean and Integer values are very often and much more efficiently
compared directly instead of using toString.
Change-Id: I5fd736427019406469357cda1115d2683b7a5e2b
2014-04-09 11:47:21 +02:00
Henri Sara
3edf6bd933
Don't add slash after jsessionid in URL ( #12307 )
...
Change-Id: Ic329b4307bcc0613e6c0160375003d4b9f7e7ee1
2014-04-09 06:31:10 +00:00
Felype Santiago Ferreira
f32e3535c6
Update Accordion and TabSheet to use Vaadin 7 style. ( #13402 ).
...
This change also adds subpart support for TabSheet and
converts a test to TB3.
Change-Id: I23b6c81686ea6587470d8019e89a85149ec0b068
2014-04-08 06:34:55 +00:00
Artur Signell
ef8920661c
Update Atmosphere 2.1.2.vaadin2 ( #12329 )
...
Contains websockets fixes for Tomcat 8 and Wildfly 8
Change-Id: I55b6576dfffd611f819a434d9b05edf1e5c6eda8
2014-04-07 19:29:25 +03:00
Artur Signell
ff4cce403e
Update Atmosphere 2.1.2 for better Tomcat 8 support ( #12329 )
...
Change-Id: If6362284392d17ff18e2a907439db3339344d2b1
2014-04-03 21:26:16 +03:00
Jonatan Kronqvist
d307f145f3
Override elements must be after dependency elements #13532
...
Change-Id: I8cc1fd86a8ba7ba64595809afbd964e3b384d658
2014-04-03 13:36:13 +03:00
Jonatan Kronqvist
3efe81da8b
Override the cssparser dependency from sass-compiler ( #13532 )
...
vaadin-sass-compiler depends on an older version of cssparser than the
one used in client-compiler. This change overrides all sass-compiler
provided cssparser deps with the newer version.
Change-Id: I06d2b957d66dd3abbef161ae2643eec0cdf7e13a
2014-04-03 13:26:01 +03:00
Jonatan Kronqvist
563b0ca0d8
Update commons-io to the same version in all modules ( #13531 )
...
Adds a commons-io.version property to the build.properties file
Change-Id: I57a72f8841846d77ba73d567bd9bc3c8415b243c
2014-04-03 10:28:02 +03:00
Johannes Dahlström
3d0ff32bea
Prevent duplicate detach() calls with push ( #13261 )
...
This used to happen when push was disconnected due to a UI or session
expiring. requestStart() and requestEnd() were called on disconnect
even though a disconnection is not a request.
Change-Id: I31d9cae65ec75b5046802a54bbe4564d6e44b29f
2014-04-02 20:15:41 +00:00
Artur Signell
637ff47630
Wait for all messages to be sent before disconnect ( #13529 )
...
Change-Id: Ic9d5d4ac3a3f19bb906cba64cf752461d4b16ba5
2014-04-02 22:21:34 +03:00
Artur Signell
74a635fce2
Do not allow Atmosphere to make session infinitely long ( #12139 )
...
Change-Id: I09d39ff40f9adda20eb38056ab94ddfa0b07fb64
2014-04-02 20:55:35 +03:00
Artur Signell
7f9ea1c915
Workaround for Atmosphere race condition ( #13528 )
...
Change-Id: I39cb72ef9a1f6c6424dce7f9feff2cebbfe3fdfd
2014-04-02 20:13:52 +03:00