From f2551a9fc03636deb5fcd3f30c761dca946c8341 Mon Sep 17 00:00:00 2001
From: Taras Hupalo <taras.hupalo@gmail.com>
Date: Tue, 12 Aug 2014 15:28:41 +0300
Subject: replaced all org.json.* usages with elemental.json.* (#8942)

Change-Id: I4809fbbdb48f3e36c8e1da8552ff3fa734714105
---
 shared/ivy.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'shared')

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" />
 
-- 
cgit v1.2.3


From 3e4651747d059ed760fbd69197c5fad0e289bd2d Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Wed, 27 Aug 2014 14:29:36 +0300
Subject: Update TabsheetState.tabs to be declared as List (#14512)

Change-Id: I53055ed64e0e9764b48edbc492dae5f16e1dd9bd
---
 shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'shared')

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;
-- 
cgit v1.2.3