]>
source.dussan.org Git - vaadin-framework.git/log
Henri Sara [Thu, 8 Dec 2011 08:23:41 +0000 (10:23 +0200)]
Merge branch 'master' into databinding
Conflicts:
src/com/vaadin/data/util/PropertyFormatter.java
src/com/vaadin/data/validator/CompositeValidator.java
tests/testbench/com/vaadin/tests/tickets/Ticket20.java
Artur Signell [Mon, 5 Dec 2011 21:32:08 +0000 (23:32 +0200)]
Removed Java 6 @Override annotations
Artur Signell [Mon, 5 Dec 2011 21:30:52 +0000 (23:30 +0200)]
#8061 Removed NativeButton(String caption, Object target, String
methodName) constructor and fixed tests
Artur Signell [Mon, 5 Dec 2011 20:41:37 +0000 (22:41 +0200)]
#8061 Remove Button(String caption, Object target, String methodName)
constructor
Leif Åstrand [Thu, 1 Dec 2011 15:37:44 +0000 (17:37 +0200)]
Merge remote branch 'origin/contrib'
Leif Åstrand [Thu, 1 Dec 2011 13:20:28 +0000 (15:20 +0200)]
Remove the last simple ie6 hacks #7912
Artur Signell [Fri, 25 Nov 2011 11:53:09 +0000 (11:53 +0000)]
Merged fixes from 6.7
svn changeset:22132/svn branch:6.8
Jens Jansson [Thu, 1 Dec 2011 15:13:45 +0000 (17:13 +0200)]
#8019 Remove UserError(String, int, int) as the new UserError(String, ContentMode, ErrorLevel) is still backwards compatible when the constants are used
Jens Jansson [Thu, 1 Dec 2011 15:12:17 +0000 (17:12 +0200)]
#8019 Added deprecated comments on deprecated constants.
Jens Jansson [Thu, 1 Dec 2011 15:06:09 +0000 (17:06 +0200)]
#8019 Changed so that instead of using ErrorLevel.ordinal(), ErrorLevel.intValue() is used.
Jens Jansson [Thu, 1 Dec 2011 14:57:56 +0000 (16:57 +0200)]
#8019 Add a intValue-method to ErrorMessage.ErrorLevel enum which should be used rather than the ordinal so that enum order doesn't matter. Switching use of ordinal to intValue coming up in next commit.
Jens Jansson [Thu, 1 Dec 2011 14:49:20 +0000 (16:49 +0200)]
#8019 Earlier commit hid away the possibility for Buffered.getErrorLevel() to return INFORMATION (is this possible?). Reworked the code to allow it.
Jens Jansson [Thu, 1 Dec 2011 14:26:00 +0000 (16:26 +0200)]
#8019 Remove CompositeValidator(int, String) as the new CompositeValidator(CombinationMode, String) is still backwards compatible when the constants are used
Added deprecated comment into constants.
Jens Jansson [Thu, 1 Dec 2011 13:30:02 +0000 (15:30 +0200)]
Removed the deprecated sizing with float API in Sizable.
Leif Åstrand [Thu, 1 Dec 2011 13:20:57 +0000 (15:20 +0200)]
Merge remote branch 'origin/6.8'
Leif Åstrand [Thu, 1 Dec 2011 13:20:28 +0000 (15:20 +0200)]
Remove the last simple ie6 hacks #7912
Jens Jansson [Thu, 1 Dec 2011 13:20:19 +0000 (15:20 +0200)]
Converted UserError content type to an enum. There is probably other places where we will have Text/UIDL/XHTML enum and this should be merged with the main one down the road.
Jens Jansson [Thu, 1 Dec 2011 13:13:41 +0000 (15:13 +0200)]
Moved error level communication strings away from all the subclasses to the centralized ErrorLevel enum.
Jens Jansson [Thu, 1 Dec 2011 13:08:55 +0000 (15:08 +0200)]
Modified ErrorMessage's error level from int's to an enum called ErrorLevel.
Jens Jansson [Thu, 1 Dec 2011 13:01:58 +0000 (15:01 +0200)]
Changed CompositeValidator's combination mode from int constants to an enum.
Henri Sara [Thu, 1 Dec 2011 10:42:01 +0000 (12:42 +0200)]
#8026 remove some deprecated API from CustomComponent
Henri Sara [Thu, 1 Dec 2011 09:05:53 +0000 (11:05 +0200)]
Handle fields with no data source in AbstractField.convertToDataSource()
Henri Sara [Thu, 1 Dec 2011 09:03:20 +0000 (11:03 +0200)]
Minor fixes to data binding tests based on review.
Leif Åstrand [Tue, 29 Nov 2011 12:36:37 +0000 (14:36 +0200)]
Remove java 1.6 @Override annotations methods from interfaces
Artur Signell [Mon, 28 Nov 2011 13:21:57 +0000 (15:21 +0200)]
Removed executable flag
Artur Signell [Mon, 28 Nov 2011 13:15:02 +0000 (15:15 +0200)]
Removed @Override annotations from interface methods
Artur Signell [Mon, 28 Nov 2011 13:13:33 +0000 (15:13 +0200)]
Removed @Override annotations from interface methods
Artur Signell [Mon, 28 Nov 2011 13:08:51 +0000 (15:08 +0200)]
Method for getting all Fields in Vaadin
Artur Signell [Mon, 28 Nov 2011 13:07:18 +0000 (15:07 +0200)]
Misc tests for converters
Artur Signell [Mon, 28 Nov 2011 11:50:00 +0000 (13:50 +0200)]
Removed interface @Overrides
Artur Signell [Mon, 28 Nov 2011 11:43:22 +0000 (13:43 +0200)]
Initial implementation of using converters in Table
Artur Signell [Mon, 28 Nov 2011 11:43:07 +0000 (13:43 +0200)]
Initial implementation of converters for AbstractField
Artur Signell [Mon, 28 Nov 2011 11:39:03 +0000 (13:39 +0200)]
Default value for a CheckBox is now false and not null. Removed
old booleanValue as getValue() returns true/false now for all basic
cases
Artur Signell [Fri, 25 Nov 2011 15:48:47 +0000 (17:48 +0200)]
First take on Converters
Artur Signell [Fri, 25 Nov 2011 11:53:09 +0000 (11:53 +0000)]
Merged fixes from 6.7
svn changeset:22132/svn branch:6.8
Artur Signell [Thu, 24 Nov 2011 09:17:37 +0000 (11:17 +0200)]
Merge branch 'master' into databinding
Artur Signell [Thu, 24 Nov 2011 08:34:30 +0000 (10:34 +0200)]
Merge remote-tracking branch 'origin/6.8'
Artur Signell [Thu, 24 Nov 2011 08:32:44 +0000 (08:32 +0000)]
Added ids and re-enabled test
svn changeset:22114/svn branch:6.8
Artur Signell [Thu, 24 Nov 2011 08:32:35 +0000 (08:32 +0000)]
Added ids and re-enabled test
svn changeset:22113/svn branch:6.8
Matti Tahvonen [Wed, 23 Nov 2011 09:10:08 +0000 (09:10 +0000)]
disabled test, testbench don't support custom implementations of client side components
svn changeset:22101/svn branch:6.8
Artur Signell [Tue, 22 Nov 2011 15:42:01 +0000 (17:42 +0200)]
#7964 Fixed test
Artur Signell [Tue, 22 Nov 2011 15:34:35 +0000 (17:34 +0200)]
#7985 Method for checking if browser is too old to work with Vaadin 7
Artur Signell [Tue, 22 Nov 2011 15:06:16 +0000 (17:06 +0200)]
#7913 Removed IE6/IE7 related fix from merged change
Artur Signell [Tue, 22 Nov 2011 15:05:42 +0000 (17:05 +0200)]
#7984 removed Firefox workarounds
Artur Signell [Tue, 22 Nov 2011 14:47:20 +0000 (16:47 +0200)]
FIXME comment for the future
Artur Signell [Tue, 22 Nov 2011 14:37:40 +0000 (16:37 +0200)]
#7963 Additional fixes
Removed special case from widget set that used to support VButton
changing into VCheckBox
Corrected tests
Artur Signell [Tue, 22 Nov 2011 13:56:13 +0000 (15:56 +0200)]
#7964 Fixed test to be compatible with CheckBox change
Henri Sara [Tue, 22 Nov 2011 13:17:15 +0000 (13:17 +0000)]
Added license header to VDragAndDropWrapperIE.java
svn changeset:22095/svn branch:6.8
Artur Signell [Tue, 22 Nov 2011 11:17:52 +0000 (13:17 +0200)]
Added WebContent/VAADIN/widgetsets to .gitignore as git cannot track empty directories and complains about changes when DefaultWidgetSet has been compiled
Artur Signell [Tue, 22 Nov 2011 11:08:29 +0000 (13:08 +0200)]
#7981 Removed Firefox 2 specific code and CSS
Artur Signell [Tue, 22 Nov 2011 11:05:51 +0000 (13:05 +0200)]
#7913 Removed IE7 specific CSS rules
Artur Signell [Tue, 22 Nov 2011 10:57:54 +0000 (12:57 +0200)]
#7913 Removed IE7 related stuff
Artur Signell [Tue, 22 Nov 2011 10:34:21 +0000 (12:34 +0200)]
#7964 Added booleanValue() to CheckBox for now. Can probably be removed
once
CheckBox.getValue() return Boolean
Artur Signell [Tue, 22 Nov 2011 10:31:21 +0000 (12:31 +0200)]
#7963 Button now extends AbstractComponent instead of AbstractField
Focus related methods previously used from AbstractField are now
implemented in Button directly.
Fixed tests related to this change.
Artur Signell [Tue, 22 Nov 2011 10:26:53 +0000 (12:26 +0200)]
#7963 Moved ActionManager from AbstractField to AbstractComponent to
enable Button to extend AbstractComponent
Artur Signell [Tue, 22 Nov 2011 09:10:03 +0000 (11:10 +0200)]
#7964 CheckBox now extends AbstractField directly.
ClickListener is no longer available for a CheckBox.
Fixed tests accordingly
Artur Signell [Tue, 22 Nov 2011 09:03:10 +0000 (11:03 +0200)]
#7913 Removed IE7 specific code from Button
Artur Signell [Tue, 22 Nov 2011 09:02:07 +0000 (11:02 +0200)]
#7913 Removed IE6/IE7 specific code from CheckBox
Artur Signell [Tue, 22 Nov 2011 07:27:07 +0000 (09:27 +0200)]
Removed demo related ignores that are no longer relevant
Henri Sara [Tue, 22 Nov 2011 11:01:14 +0000 (11:01 +0000)]
Merge some changes from 6.7 to 6.8
svn changeset:22091/svn branch:6.8
Leif Åstrand [Tue, 22 Nov 2011 10:14:22 +0000 (12:14 +0200)]
Merge remote branch 'origin/6.8'
Conflicts:
tests/integration_tests.xml
Leif Åstrand [Tue, 22 Nov 2011 10:06:39 +0000 (10:06 +0000)]
Merge changes from 6.7 to 6.8
svn changeset:22090/svn branch:6.8
Matti Tahvonen [Mon, 21 Nov 2011 14:18:27 +0000 (14:18 +0000)]
renamed html file so that test bench don't think it is a test script
svn changeset:22085/svn branch:6.8
Matti Tahvonen [Mon, 21 Nov 2011 14:18:08 +0000 (14:18 +0000)]
renamed html file so that test bench don't think it is a test script
svn changeset:22084/svn branch:6.8
Matti Tahvonen [Mon, 21 Nov 2011 13:38:31 +0000 (13:38 +0000)]
dragandropwrapper can now initiate html5 drags, fixes #7833
svn changeset:22081/svn branch:6.8
Artur Signell [Thu, 17 Nov 2011 13:37:04 +0000 (13:37 +0000)]
Merged fixes from 6.7
svn changeset:22048/svn branch:6.8
Henri Sara [Wed, 16 Nov 2011 10:39:05 +0000 (10:39 +0000)]
Merged some changes from 6.7 to 6.8
svn changeset:22016/svn branch:6.8
Henri Sara [Tue, 15 Nov 2011 14:52:47 +0000 (14:52 +0000)]
Merged #7837 to Vaadin 6.8
svn changeset:22010/svn branch:6.8
Henri Sara [Mon, 14 Nov 2011 09:36:40 +0000 (11:36 +0200)]
Merge branch 'master' into databinding
Henri Sara [Sat, 12 Nov 2011 10:18:27 +0000 (12:18 +0200)]
#7930 Eliminate Validator.isValid()
Eliminate the redundant method Validator.isValid(). Validator.validate()
does the same but throws an exception including the validation error
message.
Migration:
- replace implementations of isValid() with internalIsValid() in custom
subclasses of AbstractValidator
- use Validator.validate() and catch exceptions rather than call
Validator.isValid()
- note that AbstractField still provides an isValid() method that is
internally based on validate()
Artur Signell [Fri, 11 Nov 2011 13:25:44 +0000 (15:25 +0200)]
Dummy commit #1 for testing repository
Artur Signell [Fri, 11 Nov 2011 12:56:05 +0000 (14:56 +0200)]
Merge remote branch 'origin/6.8'
Henri Sara [Fri, 11 Nov 2011 12:37:57 +0000 (14:37 +0200)]
Convert nested data model event classes to static where possible.
Henri Sara [Fri, 11 Nov 2011 11:11:01 +0000 (13:11 +0200)]
Eliminate more Field and Property related raw type warnings.
Eliminate some more warnings for use of raw types (Field, Property,
Class), mostly by changing API method return types.
Artur Signell [Fri, 11 Nov 2011 08:50:14 +0000 (10:50 +0200)]
Merge branch 'master' of ssh://git@dev.vaadin.com/vaadin
Henri Sara [Fri, 11 Nov 2011 08:40:15 +0000 (10:40 +0200)]
Eliminate some generics related warnings in core (non-API).
Eliminate some (mostly Field and Property related) warnings about
raw types etc. No modifications to public API, only inside methods and
private API.
Leif Åstrand [Fri, 11 Nov 2011 08:25:39 +0000 (10:25 +0200)]
Longer pause before taking the inital screenshot (#7396)
Leif Åstrand [Fri, 11 Nov 2011 07:52:25 +0000 (09:52 +0200)]
Run integration tests with Safari 5 instead of Firefox 3.6 (#7396)
Henri Sara [Thu, 10 Nov 2011 14:06:30 +0000 (16:06 +0200)]
Eliminate many generics related warnings in tests.
Most of the warnings eliminated are related to generics for
Property, Field or field factories. Not all such warnings are eliminated
in this changeset.
Henri Sara [Thu, 10 Nov 2011 14:04:50 +0000 (16:04 +0200)]
Change Form.addField() parameter from Field to Field<?>.
Henri Sara [Thu, 10 Nov 2011 14:03:56 +0000 (16:03 +0200)]
Eliminate generics related warnings in field factories.
Artur Signell [Thu, 10 Nov 2011 14:02:00 +0000 (14:02 +0000)]
#7918 Test with Firefox 8
svn changeset:21959/svn branch:6.7
Artur Signell [Thu, 10 Nov 2011 13:26:00 +0000 (15:26 +0200)]
Firefox 7 -> 8
Henri Sara [Thu, 10 Nov 2011 12:39:52 +0000 (14:39 +0200)]
Merge branch 'master' into databinding
Henri Sara [Thu, 10 Nov 2011 12:30:07 +0000 (14:30 +0200)]
#7917 Add BeanItem.expandProperty() and use it in form tests.
Leif Åstrand [Thu, 10 Nov 2011 11:42:43 +0000 (13:42 +0200)]
Minor formatting changes
Leif Åstrand [Thu, 10 Nov 2011 11:42:07 +0000 (13:42 +0200)]
Minor formatting change
Henri Sara [Thu, 10 Nov 2011 07:32:48 +0000 (09:32 +0200)]
#6887 addNestedContainerBean() in AbstractBeanContainer to replace a
property with all of its nested properties
Leif Åstrand [Wed, 9 Nov 2011 14:48:12 +0000 (16:48 +0200)]
#7912 Remove support for IE6
Leif Åstrand [Wed, 9 Nov 2011 13:14:39 +0000 (15:14 +0200)]
Formatting changes
Henri Sara [Wed, 9 Nov 2011 12:00:18 +0000 (14:00 +0200)]
Create scaffolding for data binding tests (one/many-to-one/many).
Created test class Millionaire with multiple residences.
Created test classes User and Role which refer to collections of each
other. Each direction of the relationship is handled differently.
Initial test class scaffolding for data binding changes (FormOneToOne
and FormOneToMany, FormManyToMany).
Henri Sara [Wed, 9 Nov 2011 11:06:01 +0000 (13:06 +0200)]
Split Address out from test class Person.
Address split out of test class Person and refactoring of old tests
using Person.
Artur Signell [Tue, 8 Nov 2011 16:20:44 +0000 (18:20 +0200)]
Merge remote branch 'origin/6.8'
Henri Sara [Tue, 8 Nov 2011 16:08:51 +0000 (18:08 +0200)]
Merge branch 'master' into databinding
Artur Signell [Tue, 8 Nov 2011 16:03:45 +0000 (16:03 +0000)]
Test for #7908
svn changeset:21947/svn branch:6.7
Henri Sara [Tue, 8 Nov 2011 16:02:55 +0000 (18:02 +0200)]
Parameterize Property and Field with the value type.
The interfaces Property and Field and most of their implementations are
now parameterized with the type of their value. The method getValue()
returns the Property type but setValue() takes Object as its parameter.
No implicit conversions between value type and strings are performed in
most locations (fields).
Among others, AbstractTextField, DateField and RichTextArea not have
specific value types and do not accept arbitrary values.
Most locations requiring migration will be visible as compilation
errors, with the exception of some cases where a non-parameterized
Property or Field (or one parametrized with Object) is used.
Not yet done:
- Label
- converters
- setValue() parameterization (causes much more migration effort)
Leif Åstrand [Tue, 8 Nov 2011 15:28:27 +0000 (17:28 +0200)]
Merge remote-tracking branch 'origin/6.8' into master
Artur Signell [Tue, 8 Nov 2011 14:29:40 +0000 (14:29 +0000)]
Removed svn:executable property to avoid problems with Git on Windows
svn changeset:21944/svn branch:6.7
Henri Sara [Tue, 8 Nov 2011 09:24:12 +0000 (11:24 +0200)]
Eliminate more cases that used Property.toString().
Remaining possibly problematic cases include Label.compareTo(),
TestForPreconfiguredComponents and TestForTrees.
Artur Signell [Tue, 8 Nov 2011 08:35:37 +0000 (08:35 +0000)]
Test for file uploads. Not run automatically due to limitations in testing file uploads with TestBench/Selenium.
svn changeset:21938/svn branch:6.7