source.dussan.org Git - vaadin-framework.git/commit

]> source.dussan.org Git - vaadin-framework.git/commit

projects / vaadin-framework.git / commit

author	Johannes Dahlström <johannesd@vaadin.com>
	Tue, 19 Jun 2012 11:48:49 +0000 (14:48 +0300)
committer	Johannes Dahlström <johannesd@vaadin.com>
	Tue, 19 Jun 2012 11:48:49 +0000 (14:48 +0300)
commit	a821f9fdd5b853409c7f7c3a22eba0733e2900c6
tree	94afcb8342d1e7174741e90fa0bd20c0b0d51bfc	tree \| snapshot
parent	d3a13928a8f856ae3bff668db7f13d6f60f7a358	commit \| diff
parent	1401003a10eb328995b92351e9f716fce705dfc8	commit \| diff

Merge branch '6.8'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java
src/com/vaadin/terminal/gwt/client/ui/form/VForm.java
src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java
tests/server-side/com/vaadin/tests/VaadinClasses.java

Removed Java5-incompatible @Override annotations

42 files changed:

WebContent/VAADIN/themes/base/common/common.css	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/Application.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/data/util/MethodPropertyDescriptor.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/data/util/sqlcontainer/SQLContainer.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/AbstractClickEventHandler.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/accordion/VAccordion.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/button/VButton.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/form/VForm.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/panel/VPanel.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelConnector.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/server/DragAndDropService.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/server/WebBrowser.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/ui/AbstractSplitPanel.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/ui/Button.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/ui/TabSheet.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/ui/Table.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/ui/TreeTable.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/ui/Window.java	diff1 \|	diff2 \|	blob \| history
tests/server-side/com/vaadin/tests/VaadinClasses.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/tickets/Ticket6002.java	diff1 \|	diff2 \|	blob \| history

Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework

RSS Atom

WebContent/VAADIN/themes/base/common/common.css	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/Application.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/data/util/MethodPropertyDescriptor.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/data/util/sqlcontainer/SQLContainer.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/AbstractClickEventHandler.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/accordion/VAccordion.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/button/VButton.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/form/VForm.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/panel/VPanel.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelConnector.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/server/DragAndDropService.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/server/WebBrowser.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/ui/AbstractSplitPanel.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/ui/Button.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/ui/TabSheet.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/ui/Table.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/ui/TreeTable.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/ui/Window.java	diff1 \|	diff2 \|	blob \| history
tests/server-side/com/vaadin/tests/VaadinClasses.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/tickets/Ticket6002.java	diff1 \|	diff2 \|	blob \| history