diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-09-03 11:48:47 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-09-03 15:33:01 +0300 |
| commit | 927e424acc1e43a12bdbbcd971302d00717af540 (patch) | |
| tree | a91f0486fb646f6d1de9a4d590e25100347cc7ec /shared | |
| parent | 600d5b436d7ca33840b1b697082d140a5040bdf3 (diff) | |
| parent | f6282cbe0386d03b57a65450bc163b20bfecfb70 (diff) | |
| download | vaadin-framework-927e424acc1e43a12bdbbcd971302d00717af540.tar.gz vaadin-framework-927e424acc1e43a12bdbbcd971302d00717af540.zip | |
Merge remote-tracking branch 'origin/master' into grid
This merge needs Grid to use elemental.json instead of org.json
Change-Id: Ib3c387c7e282b2502f266bafbdaad8727f5dc6ef
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/ivy.xml | 2 | ||||
| -rw-r--r-- | shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/shared/ivy.xml b/shared/ivy.xml index 2dac7adbc2..dcb7390c04 100644 --- a/shared/ivy.xml +++ b/shared/ivy.xml @@ -27,8 +27,6 @@ conf="build,ide,test->default" /> <dependency org="com.vaadin.external.google" name="guava" rev="16.0.1.vaadin1" conf="build,ide,test->default" /> - <dependency org="com.vaadin.external.json" name="json" - rev="0.0.20080701" conf="build,ide,test->default" /> <dependency org="junit" name="junit" rev="4.11" conf="test,ide -> default" /> diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java index b96a1c9b79..98a1d2b87f 100644 --- a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java +++ b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java @@ -16,6 +16,7 @@ package com.vaadin.shared.ui.tabsheet; import java.util.ArrayList; +import java.util.List; import com.vaadin.shared.AbstractComponentState; @@ -32,7 +33,7 @@ public class TabsheetState extends AbstractComponentState { */ public int tabIndex; - public ArrayList<TabState> tabs = new ArrayList<TabState>(); + public List<TabState> tabs = new ArrayList<TabState>(); /** true to show the tab bar, false to only show the contained component */ public boolean tabsVisible = true; |