]> source.dussan.org Git - vaadin-framework.git/commit
Merge commit '116cd1f29a432fe5ca64f3023a9fec1ca130f078' (origin/6.8)
authorArtur Signell <artur@vaadin.com>
Tue, 31 Jan 2012 16:49:57 +0000 (18:49 +0200)
committerArtur Signell <artur@vaadin.com>
Tue, 31 Jan 2012 16:49:57 +0000 (18:49 +0200)
commit94a7e95d37925e8784fc00d4b4f800f6bf7c1ee8
tree3b82893b981c909a18afa58622162732a169866b
parentc1f26940cd893dc5e89d2c6eb39d83ce668557fe
parent116cd1f29a432fe5ca64f3023a9fec1ca130f078
Merge commit '116cd1f29a432fe5ca64f3023a9fec1ca130f078' (origin/6.8)

Manually merged CRLF changes + additional small patch for changes that SHOULD NOT be in the changeset but that the SVN -> GIT sync script has added
269 files changed:
src/com/vaadin/data/fieldgroup/BeanFieldGroup.java
src/com/vaadin/data/fieldgroup/Caption.java
src/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java
src/com/vaadin/data/fieldgroup/FieldGroup.java
src/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java
src/com/vaadin/data/fieldgroup/PropertyId.java
src/com/vaadin/data/util/TextFileProperty.java
src/com/vaadin/data/util/TransactionalPropertyWrapper.java
src/com/vaadin/data/util/converter/Converter.java
src/com/vaadin/data/util/converter/ConverterFactory.java
src/com/vaadin/data/util/converter/DateToLongConverter.java
src/com/vaadin/data/util/converter/DefaultConverterFactory.java
src/com/vaadin/data/util/converter/ReverseConverter.java
src/com/vaadin/data/util/converter/StringToBooleanConverter.java
src/com/vaadin/data/util/converter/StringToDateConverter.java
src/com/vaadin/data/util/converter/StringToDoubleConverter.java
src/com/vaadin/data/util/converter/StringToIntegerConverter.java
src/com/vaadin/data/util/converter/StringToNumberConverter.java
src/com/vaadin/data/validator/BeanValidator.java
src/com/vaadin/data/validator/DateRangeValidator.java
src/com/vaadin/data/validator/RangeValidator.java
src/com/vaadin/external/json/JSONException.java
src/com/vaadin/external/json/JSONString.java
src/com/vaadin/external/json/JSONStringer.java
src/com/vaadin/external/json/JSONWriter.java
src/com/vaadin/terminal/gwt/client/VBrowserDetails.java
src/com/vaadin/terminal/gwt/client/VPaintable.java
src/com/vaadin/terminal/gwt/client/VPaintableMap.java
src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayoutPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidget.java
src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidgetContainer.java
src/com/vaadin/terminal/gwt/client/ui/VAbstractSplitPanelPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VAccordionPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VAudioPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
src/com/vaadin/terminal/gwt/client/ui/VCheckBoxPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VCssLayoutPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VCustomComponentPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VCustomLayoutPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java
src/com/vaadin/terminal/gwt/client/ui/VDragAndDropWrapperPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VFormLayoutPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VFormPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VGridLayoutPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VHorizontalLayoutPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VHorizontalSplitPanelPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VMediaBasePaintable.java
src/com/vaadin/terminal/gwt/client/ui/VMenuBarPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VOrderedLayoutPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VPanelPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
src/com/vaadin/terminal/gwt/client/ui/VPopupViewPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VScrollTablePaintable.java
src/com/vaadin/terminal/gwt/client/ui/VSlider.java
src/com/vaadin/terminal/gwt/client/ui/VSliderPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VTabsheetBasePaintable.java
src/com/vaadin/terminal/gwt/client/ui/VTabsheetPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VTextArea.java
src/com/vaadin/terminal/gwt/client/ui/VTreePaintable.java
src/com/vaadin/terminal/gwt/client/ui/VTreeTablePaintable.java
src/com/vaadin/terminal/gwt/client/ui/VVerticalLayoutPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VVerticalSplitPanelPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VVideoPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VViewPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VWindowPaintable.java
src/com/vaadin/terminal/gwt/client/ui/label/VLabelPaintable.java
src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayoutPaintable.java
src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextAreaPaintable.java
src/com/vaadin/terminal/gwt/server/WrappedPortletRequest.java
src/com/vaadin/ui/ComboBox.java
src/com/vaadin/ui/InlineDateField.java
tests/server-side/com/vaadin/data/util/ObjectPropertyTest.java
tests/server-side/com/vaadin/data/util/TestContainerSorting.java
tests/server-side/com/vaadin/tests/data/bean/Address.java
tests/server-side/com/vaadin/tests/data/bean/BeanToValidate.java
tests/server-side/com/vaadin/tests/data/bean/Country.java
tests/server-side/com/vaadin/tests/data/bean/Person.java
tests/server-side/com/vaadin/tests/data/bean/PersonWithBeanValidationAnnotations.java
tests/server-side/com/vaadin/tests/data/bean/Sex.java
tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java
tests/server-side/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java
tests/server-side/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java
tests/server-side/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactory.java
tests/server-side/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java
tests/server-side/com/vaadin/tests/server/component/datefield/ResolutionTest.java
tests/server-side/com/vaadin/tests/server/component/slider/SliderTest.java
tests/server-side/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java
tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java
tests/server-side/com/vaadin/tests/server/components/AbstractTestFieldValueChange.java
tests/server-side/com/vaadin/tests/server/components/TestComboBoxValueChange.java
tests/server-side/com/vaadin/tests/server/components/TestTextFieldValueChange.java
tests/server-side/com/vaadin/tests/server/components/TestWindow.java
tests/server-side/com/vaadin/tests/server/validation/RangeValidatorTest.java
tests/server-side/com/vaadin/tests/server/validation/TestReadOnlyValidation.java
tests/server-side/com/vaadin/tests/util/GraphVizClassHierarchyCreator.java
tests/server-side/com/vaadin/tests/util/TestUtil.java
tests/testbench/com/vaadin/tests/Components.java
tests/testbench/com/vaadin/tests/TestComponentAddAndRecursion.java
tests/testbench/com/vaadin/tests/application/ApplicationCloseTest.java
tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java
tests/testbench/com/vaadin/tests/components/AbstractComponentContainerTest.java
tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java
tests/testbench/com/vaadin/tests/components/AbstractTestCase.java
tests/testbench/com/vaadin/tests/components/TestBase.java
tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java
tests/testbench/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java
tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java
tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java
tests/testbench/com/vaadin/tests/components/abstractfield/DoubleInTextField.java
tests/testbench/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java
tests/testbench/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java
tests/testbench/com/vaadin/tests/components/abstractfield/TextFieldConversions.java
tests/testbench/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java
tests/testbench/com/vaadin/tests/components/button/Buttons2.java
tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java
tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes2.java
tests/testbench/com/vaadin/tests/components/customcomponent/ClipContent.java
tests/testbench/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java
tests/testbench/com/vaadin/tests/components/customfield/AddressField.java
tests/testbench/com/vaadin/tests/components/customfield/AddressFormExample.java
tests/testbench/com/vaadin/tests/components/customfield/BooleanField.java
tests/testbench/com/vaadin/tests/components/customfield/BooleanFieldExample.java
tests/testbench/com/vaadin/tests/components/customfield/EmbeddedForm.java
tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
tests/testbench/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java
tests/testbench/com/vaadin/tests/components/datefield/DateFieldTest.java
tests/testbench/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java
tests/testbench/com/vaadin/tests/components/datefield/InlineDateFields.java
tests/testbench/com/vaadin/tests/components/datefield/PopupDateFields.java
tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.java
tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortCut.java
tests/testbench/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java
tests/testbench/com/vaadin/tests/components/label/LabelTest.java
tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java
tests/testbench/com/vaadin/tests/components/notification/Notifications.java
tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
tests/testbench/com/vaadin/tests/components/popupview/PopupViewNullValues.java
tests/testbench/com/vaadin/tests/components/popupview/PopupViewWithRTE.java
tests/testbench/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java
tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java
tests/testbench/com/vaadin/tests/components/table/DoublesInTable.java
tests/testbench/com/vaadin/tests/components/table/EditableModeChange.java
tests/testbench/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
tests/testbench/com/vaadin/tests/components/table/TableExtraScrollbars.java
tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.java
tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.java
tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java
tests/testbench/com/vaadin/tests/components/table/TableWithManyColumns.java
tests/testbench/com/vaadin/tests/components/table/Tables.java
tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTest.java
tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java
tests/testbench/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java
tests/testbench/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
tests/testbench/com/vaadin/tests/components/textfield/TextFieldTest.java
tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.java
tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.java
tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.java
tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.java
tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java
tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java
tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
tests/testbench/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java
tests/testbench/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java
tests/testbench/com/vaadin/tests/dd/VMyDragSourcePaintable.java
tests/testbench/com/vaadin/tests/dd/VMyDropTargetPaintable.java
tests/testbench/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java
tests/testbench/com/vaadin/tests/fieldgroup/BasicPersonForm.java
tests/testbench/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java
tests/testbench/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java
tests/testbench/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
tests/testbench/com/vaadin/tests/layouts/CaptionsInLayouts.java
tests/testbench/com/vaadin/tests/layouts/HiddenHorizontalLayout.java
tests/testbench/com/vaadin/tests/layouts/TestAbsoluteLayout.java
tests/testbench/com/vaadin/tests/layouts/TestLayoutPerformance.java
tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.java
tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
tests/testbench/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
tests/testbench/com/vaadin/tests/minitutorials/CustomConverterFactoryRoot.java
tests/testbench/com/vaadin/tests/minitutorials/MyConverterFactory.java
tests/testbench/com/vaadin/tests/minitutorials/MyStringToDoubleConverter.java
tests/testbench/com/vaadin/tests/tickets/Ticket124.java
tests/testbench/com/vaadin/tests/tickets/Ticket1245.java
tests/testbench/com/vaadin/tests/tickets/Ticket1365.java
tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer.java
tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java
tests/testbench/com/vaadin/tests/tickets/Ticket1572.java
tests/testbench/com/vaadin/tests/tickets/Ticket1581.java
tests/testbench/com/vaadin/tests/tickets/Ticket1589.java
tests/testbench/com/vaadin/tests/tickets/Ticket1663.java
tests/testbench/com/vaadin/tests/tickets/Ticket1673.java
tests/testbench/com/vaadin/tests/tickets/Ticket1710.java
tests/testbench/com/vaadin/tests/tickets/Ticket1767.java
tests/testbench/com/vaadin/tests/tickets/Ticket1772.java
tests/testbench/com/vaadin/tests/tickets/Ticket1775.java
tests/testbench/com/vaadin/tests/tickets/Ticket1804.java
tests/testbench/com/vaadin/tests/tickets/Ticket1805.java
tests/testbench/com/vaadin/tests/tickets/Ticket1806.java
tests/testbench/com/vaadin/tests/tickets/Ticket1811.java
tests/testbench/com/vaadin/tests/tickets/Ticket1819.java
tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
tests/testbench/com/vaadin/tests/tickets/Ticket1868.java
tests/testbench/com/vaadin/tests/tickets/Ticket1869.java
tests/testbench/com/vaadin/tests/tickets/Ticket1878.java
tests/testbench/com/vaadin/tests/tickets/Ticket1919.java
tests/testbench/com/vaadin/tests/tickets/Ticket1923.java
tests/testbench/com/vaadin/tests/tickets/Ticket1925.java
tests/testbench/com/vaadin/tests/tickets/Ticket1966.java
tests/testbench/com/vaadin/tests/tickets/Ticket1966_2.java
tests/testbench/com/vaadin/tests/tickets/Ticket1966_3.java
tests/testbench/com/vaadin/tests/tickets/Ticket1969.java
tests/testbench/com/vaadin/tests/tickets/Ticket1972.java
tests/testbench/com/vaadin/tests/tickets/Ticket1973.java
tests/testbench/com/vaadin/tests/tickets/Ticket1975.java
tests/testbench/com/vaadin/tests/tickets/Ticket1986.java
tests/testbench/com/vaadin/tests/tickets/Ticket1991.java
tests/testbench/com/vaadin/tests/tickets/Ticket1995.java
tests/testbench/com/vaadin/tests/tickets/Ticket2002.java
tests/testbench/com/vaadin/tests/tickets/Ticket2009.java
tests/testbench/com/vaadin/tests/tickets/Ticket2011.java
tests/testbench/com/vaadin/tests/tickets/Ticket2014.java
tests/testbench/com/vaadin/tests/tickets/Ticket2021.java
tests/testbench/com/vaadin/tests/tickets/Ticket2022.java
tests/testbench/com/vaadin/tests/tickets/Ticket2024.java
tests/testbench/com/vaadin/tests/tickets/Ticket2026.java
tests/testbench/com/vaadin/tests/tickets/Ticket2029.java
tests/testbench/com/vaadin/tests/tickets/Ticket2037.java
tests/testbench/com/vaadin/tests/tickets/Ticket2040.java
tests/testbench/com/vaadin/tests/tickets/Ticket2042.java
tests/testbench/com/vaadin/tests/tickets/Ticket2043.java
tests/testbench/com/vaadin/tests/tickets/Ticket2048.java
tests/testbench/com/vaadin/tests/tickets/Ticket2051.java
tests/testbench/com/vaadin/tests/tickets/Ticket2060.java
tests/testbench/com/vaadin/tests/tickets/Ticket2062.java
tests/testbench/com/vaadin/tests/tickets/Ticket2083.java
tests/testbench/com/vaadin/tests/tickets/Ticket2095.java
tests/testbench/com/vaadin/tests/tickets/Ticket2098.java
tests/testbench/com/vaadin/tests/tickets/Ticket2099.java
tests/testbench/com/vaadin/tests/tickets/Ticket2101.java
tests/testbench/com/vaadin/tests/tickets/Ticket2126.java
tests/testbench/com/vaadin/tests/tickets/Ticket2208.java
tests/testbench/com/vaadin/tests/tickets/Ticket2209.java
tests/testbench/com/vaadin/tests/tickets/Ticket2209OL.java
tests/testbench/com/vaadin/tests/tickets/Ticket2209OL2.java
tests/testbench/com/vaadin/tests/tickets/Ticket2215.java
tests/testbench/com/vaadin/tests/tickets/Ticket2232.java
tests/testbench/com/vaadin/tests/tickets/Ticket2287.java
tests/testbench/com/vaadin/tests/tickets/Ticket2292.java
tests/testbench/com/vaadin/tests/tickets/Ticket2297.java
tests/testbench/com/vaadin/tests/tickets/Ticket2303.java
tests/testbench/com/vaadin/tests/tickets/Ticket2407.java
tests/testbench/com/vaadin/tests/tickets/Ticket2411.java
tests/testbench/com/vaadin/tests/tickets/Ticket2998.java
tests/testbench/com/vaadin/tests/tickets/Ticket3146.java
tests/testbench/com/vaadin/tests/tickets/Ticket5053.java
tests/testbench/com/vaadin/tests/tickets/Ticket5157.java
tests/testbench/com/vaadin/tests/tickets/Ticket5952.java
tests/testbench/com/vaadin/tests/tickets/Ticket6002.java
tests/testbench/com/vaadin/tests/tickets/Ticket677.java
tests/testbench/com/vaadin/tests/util/Log.java
tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java