]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote branch 'origin/6.8'
authorLeif Åstrand <leif@vaadin.com>
Fri, 9 Dec 2011 07:40:51 +0000 (09:40 +0200)
committerLeif Åstrand <leif@vaadin.com>
Fri, 9 Dec 2011 07:40:51 +0000 (09:40 +0200)
commit0e08e671f9fd85d8396abafcbd14dc6803823987
tree55bd62bd03d148e759c74bfe05d3a2472f7d87f8
parentc6b6e3f972bf6a25f94be11c7dcc0b0a57943523
parentccdef3ddfd79938215cadc947b08a73faf5d0788
Merge remote branch 'origin/6.8'

Conflicts:
src/com/vaadin/Application.java
src/com/vaadin/data/Property.java
src/com/vaadin/data/util/PropertyFormatter.java
src/com/vaadin/terminal/ParameterHandler.java
src/com/vaadin/terminal/URIHandler.java
src/com/vaadin/terminal/gwt/client/HistoryImplIEVaadin.java
src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java
src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java
src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java
src/com/vaadin/ui/Field.java
src/com/vaadin/ui/LoginForm.java
src/com/vaadin/ui/UriFragmentUtility.java
150 files changed:
build/build.xml
src/com/vaadin/Application.java
src/com/vaadin/data/Buffered.java
src/com/vaadin/data/Container.java
src/com/vaadin/data/Item.java
src/com/vaadin/data/Property.java
src/com/vaadin/data/Validator.java
src/com/vaadin/data/util/AbstractBeanContainer.java
src/com/vaadin/data/util/AbstractProperty.java
src/com/vaadin/data/util/BeanItem.java
src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
src/com/vaadin/data/util/ContainerOrderedWrapper.java
src/com/vaadin/data/util/DefaultItemSorter.java
src/com/vaadin/data/util/FilesystemContainer.java
src/com/vaadin/data/util/IndexedContainer.java
src/com/vaadin/data/util/MethodProperty.java
src/com/vaadin/data/util/MethodPropertyDescriptor.java
src/com/vaadin/data/util/NestedMethodProperty.java
src/com/vaadin/data/util/NestedPropertyDescriptor.java
src/com/vaadin/data/util/ObjectProperty.java
src/com/vaadin/data/util/PropertyFormatter.java
src/com/vaadin/data/util/PropertysetItem.java
src/com/vaadin/data/util/QueryContainer.java
src/com/vaadin/data/util/TextFileProperty.java
src/com/vaadin/data/util/VaadinPropertyDescriptor.java
src/com/vaadin/data/util/filter/Compare.java
src/com/vaadin/data/util/filter/IsNull.java
src/com/vaadin/data/util/filter/SimpleStringFilter.java
src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java
src/com/vaadin/data/util/sqlcontainer/RowItem.java
src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
src/com/vaadin/data/validator/AbstractStringValidator.java
src/com/vaadin/data/validator/AbstractValidator.java
src/com/vaadin/data/validator/CompositeValidator.java
src/com/vaadin/data/validator/NullValidator.java
src/com/vaadin/data/validator/StringLengthValidator.java
src/com/vaadin/terminal/CompositeErrorMessage.java
src/com/vaadin/terminal/DownloadStream.java
src/com/vaadin/terminal/ErrorMessage.java
src/com/vaadin/terminal/Sizeable.java
src/com/vaadin/terminal/SystemError.java
src/com/vaadin/terminal/UserError.java
src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
src/com/vaadin/terminal/gwt/client/BrowserInfo.java
src/com/vaadin/terminal/gwt/client/Util.java
src/com/vaadin/terminal/gwt/client/VBrowserDetails.java
src/com/vaadin/terminal/gwt/client/VCaption.java
src/com/vaadin/terminal/gwt/client/WidgetSet.java
src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java
src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java
src/com/vaadin/terminal/gwt/client/ui/Icon.java
src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java
src/com/vaadin/terminal/gwt/client/ui/VAccordion.java
src/com/vaadin/terminal/gwt/client/ui/VButton.java
src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java
src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java
src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java
src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
src/com/vaadin/terminal/gwt/client/ui/VForm.java
src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java
src/com/vaadin/terminal/gwt/client/ui/VLabel.java
src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java
src/com/vaadin/terminal/gwt/client/ui/VNativeSelect.java
src/com/vaadin/terminal/gwt/client/ui/VOptionGroup.java
src/com/vaadin/terminal/gwt/client/ui/VOverlay.java
src/com/vaadin/terminal/gwt/client/ui/VPanel.java
src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
src/com/vaadin/terminal/gwt/client/ui/VSlider.java
src/com/vaadin/terminal/gwt/client/ui/VSplitPanel.java
src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
src/com/vaadin/terminal/gwt/client/ui/VTextField.java
src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java
src/com/vaadin/terminal/gwt/client/ui/VTree.java
src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java
src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java
src/com/vaadin/terminal/gwt/client/ui/VUpload.java
src/com/vaadin/terminal/gwt/client/ui/VUriFragmentUtility.java
src/com/vaadin/terminal/gwt/client/ui/VView.java
src/com/vaadin/terminal/gwt/client/ui/VWindow.java
src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java
src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java
src/com/vaadin/terminal/gwt/server/ApplicationServlet.java
src/com/vaadin/terminal/gwt/server/CommunicationManager.java
src/com/vaadin/terminal/gwt/server/Constants.java
src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java
src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java
src/com/vaadin/terminal/gwt/server/WebBrowser.java
src/com/vaadin/ui/AbstractComponent.java
src/com/vaadin/ui/AbstractField.java
src/com/vaadin/ui/AbstractSelect.java
src/com/vaadin/ui/AbstractTextField.java
src/com/vaadin/ui/BaseFieldFactory.java
src/com/vaadin/ui/Button.java
src/com/vaadin/ui/CheckBox.java
src/com/vaadin/ui/Component.java
src/com/vaadin/ui/CustomComponent.java
src/com/vaadin/ui/DateField.java
src/com/vaadin/ui/DefaultFieldFactory.java
src/com/vaadin/ui/Field.java
src/com/vaadin/ui/FieldFactory.java
src/com/vaadin/ui/Form.java
src/com/vaadin/ui/FormFieldFactory.java
src/com/vaadin/ui/Label.java
src/com/vaadin/ui/Link.java
src/com/vaadin/ui/LoginForm.java
src/com/vaadin/ui/NativeButton.java
src/com/vaadin/ui/ProgressIndicator.java
src/com/vaadin/ui/RichTextArea.java
src/com/vaadin/ui/Slider.java
src/com/vaadin/ui/Table.java
src/com/vaadin/ui/TableFieldFactory.java
src/com/vaadin/ui/Window.java
tests/server-side/com/vaadin/tests/server/LicenseInJavaFiles.java
tests/testbench/com/vaadin/tests/CustomLayoutDemo.java
tests/testbench/com/vaadin/tests/LayoutDemo.java
tests/testbench/com/vaadin/tests/ModalWindow.java
tests/testbench/com/vaadin/tests/NativeWindowing.java
tests/testbench/com/vaadin/tests/Parameters.java
tests/testbench/com/vaadin/tests/PerformanceTestSubTreeCaching.java
tests/testbench/com/vaadin/tests/RandomLayoutStress.java
tests/testbench/com/vaadin/tests/TestBench.java
tests/testbench/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java
tests/testbench/com/vaadin/tests/TestForContainerFilterable.java
tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java
tests/testbench/com/vaadin/tests/TestForNativeWindowing.java
tests/testbench/com/vaadin/tests/TestForPreconfiguredComponents.java
tests/testbench/com/vaadin/tests/TestForRichTextEditor.java
tests/testbench/com/vaadin/tests/TestForStyledUpload.java
tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
tests/testbench/com/vaadin/tests/TestForTrees.java
tests/testbench/com/vaadin/tests/TestForUpload.java
tests/testbench/com/vaadin/tests/TestForWindowOpen.java
tests/testbench/com/vaadin/tests/TestForWindowing.java
tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java
tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java
tests/testbench/com/vaadin/tests/TestSplitPanel.java
tests/testbench/com/vaadin/tests/TreeFilesystem.java
tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java
tests/testbench/com/vaadin/tests/UpgradingSample.java
tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java
tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java
tests/testbench/com/vaadin/tests/tickets/Ticket2742.java
tests/testbench/com/vaadin/tests/util/SampleDirectory.java